updated pot/po files for beta release

29 files changed, 132559 insertions, 70594 deletions

diff --git a/po/be.po b/po/be.po
index 7e67eb1e1..fb7d6fcf3 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-16 20:08+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-20 00:01+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -29,44 +30,53 @@ msgid "Jabber IM Client"
 msgstr "Jabber-праграма"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Адправіць _асобнае паведамленне..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Праглядзець сервісы..."
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Discover Services"
+msgstr "_Пошук сервісаў"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Выканаць загад..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Групавая размова"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Змяніць рахунак"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Змяніць рахунак..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -79,53 +89,81 @@ msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Выберыце адну з наступных опцый:</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сервераў (напр., транспарты MSN, ICQ)"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сервераў (напр., "
+"транспарты MSN, ICQ)"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Злучыцца па націску кнопкі \"Скончыць\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Стварэнне рахунка"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+msgid "I already have an account I want to _use"
 msgstr "Я ўжо маю патрэбны рахунак"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Па_роль:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Кіраванне..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Проксі:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Захоўваць па_роль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Здольнасці сервера"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Абнавіць профіль па злучэнні"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Адмысловы вузел / порт"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -133,67 +171,64 @@ msgstr ""
 "Трэба зарэгістраваць рахунак, каб далучыцца да\n"
 "сеткі Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Ваш JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Адмысловыя"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Скончыць"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Вузел:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Назва вузла: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "Паўта_рыце пароль:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "С_карыстаць проксі"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Імя карыстальніка:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Рознае</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Асабістыя звесткі</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Рахунак"
 
@@ -202,228 +237,371 @@ msgid "Account Modification"
 msgstr "Змяненне рахунка"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Спіс адміністратараў"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Auto-reconnect when connection is lost"
 msgstr "Аўтаматычна перадалучацца, калі знікае злучэнне"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Злучацца па старце Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "З_мяніць пароль"
 
-#: ../data/glade/account_modification_window.glade.h:9
-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"
-
 #: ../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 ""
+"Скарыстайце гэтую опцыю, калі хочаце, каб Gajim злучаўся з серверам праз "
+"порт 5223, праз які старыя серверы даюць мажлівасць выкарыстання SSL. "
+"Зважайце, што Gajim звычайна выкарыстоўвае шыфраванне TLS, калі звяртаецца "
+"да сервера, а гэтая опцыя адключыць выкарыстанне TLS"
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Выберыце _ключ..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Пстрыкніце, каб змяніць пароль рахунка"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Злучэнне"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Змяніць асабістыя звесткі..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:457
-#: ../src/notify.py:479
-#: ../src/notify.py:491
-#: ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346
-#: ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436
-#: ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154
-#: ../src/common/contacts.py:280
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Агульная"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Назва вузла: "
 
-#: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Калі гэтая опцыя ўключаная, Gajim зойме некаторыя іншыя адрасы IP, і шанец правільнай перадачы файлаў падвысіцца."
-
 #: ../data/glade/account_modification_window.glade.h:19
-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:20
-#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Калі гэтая опцыя ўключаная, Gajim будзе захоўваць пароль у файле ~/.gajim/config з правамі чытання толькі для Вас"
+#: ../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 ""
+"Калі гэтая опцыя ўключаная, Gajim зойме некаторыя іншыя адрасы IP, і шанец "
+"правільнай перадачы файлаў падвысіцца."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Калі гэтая опцыя ўключаная, Gajim будзе аўтаматычна злучацца з дапамогай гэтага рахунка"
+#: ../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 ""
+"Калі гэтая опцыя ўключаная, Gajim адпраўляе адмысловыя інфармацыйныя пакункі "
+"для запэўнівання сервера ў Вашым існаванні"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Калі гэтая опцыя ўключаная, любыя глабальныя змены стану (праз адмысловы спіс унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам"
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim будзе захоўваць пароль у файле ~/.gajim/"
+"config з правамі чытання толькі для Вас"
 
 #: ../data/glade/account_modification_window.glade.h:23
-msgid "Information about you, as stored in the server"
-msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim будзе аўтаматычна злучацца з дапамогай "
+"гэтага рахунка"
 
 #: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Кіраванне..."
+#: ../data/glade/accounts_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Калі гэтая опцыя ўключаная, любыя глабальныя змены стану (праз адмысловы "
+"спіс унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам"
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1617
-#: ../src/config.py:3414
+#: ../data/glade/accounts_window.glade.h:31
+msgid "Information about you, as stored in the server"
+msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
+
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1197
-#: ../src/config.py:1202
-#: ../src/config.py:1386
-#: ../src/config.py:1607
-#: ../src/config.py:1616
-#: ../src/config.py:1675
-#: ../src/config.py:1749
-#: ../src/config.py:3404
-#: ../src/config.py:3413
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ніякі"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Прыяры_тэт:"
 
-#: ../data/glade/account_modification_window.glade.h:31
-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:33
+#: ../data/glade/accounts_window.glade.h:42
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Прыярытэт вызначае, куды накіроўваць падзеі, калі некалькі праграмаў "
+"злучаныя з серверам праз адзін рахунак. Праграма з найвышэйшым прыярытэтам "
+"атрымлівае гэтыя падзеі"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Прыярытэт будзе змяняцца згодна з станам."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Проксі:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Рэ_сурс:"
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Назва рэсурса перадаецца серверу, каб той мог адрозніваць некалькі праграмаў, злучаных праз адзін рахунак. Такім чынам, Вы можаце злучыцца праз адзін рахунак і з рэсурса 'Дома', і з рэсурса 'Праца'. Падзеі будуць накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Назва рэсурса перадаецца серверу, каб той мог адрозніваць некалькі "
+"праграмаў, злучаных праз адзін рахунак. Такім чынам, Вы можаце злучыцца праз "
+"адзін рахунак і з рэсурса 'Дома', і з рэсурса 'Праца'. Падзеі будуць "
+"накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Захоўваць _пароль (небяспечна)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Захоўваць _журналы размоў з усімі людзьмі"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Адпраўляць праверачныя пакункі серверу"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "С_інхранізаваць стан рахунка з глабальным станам"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Адмысловы вузел / порт"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Ужыць проксі для перадачы файлаў"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Адпаведна стану"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Імя:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Уласцівасці</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Рахункі"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Калі гэтая опцыя ўключаная, усе мясцовыя кантакты з Bonjour-кліентам (напр., iChat, Trillian, Gaim) будуць паказвацца ў галоўным вакне. Для гэтага Вам не патрэбнае злучэнне.\n"
-"Гэтая мажлівасць будзе працаваць, калі ўсталяваны python-avahi і працуе сервіс avahi-daemon."
 
-#: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account"
-msgstr "Калі ў Вас некалькі рахункаў, гэтая опцыя прымушае Gajim паказваць усіх людзей з розных рахункаў у адзіным спісе"
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-mail:"
 
-#: ../data/glade/accounts_window.glade.h:5
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Уключыць"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Прозвішча:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Аб'яднаць рахункі"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Уключыць мясцовыя паведамленні"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "_Змяніць імя"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Змяніць"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "Вы_даліць"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Адмысловы порт:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -518,6 +696,7 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Апісанне</b>"
 
@@ -542,45 +721,45 @@ msgid "Deletes Message of the Day"
 msgstr "Выдаліць паведамленне дня"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Спісы прыватнасці"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr "Адправіць паведамленне ўсім далучаным людзям з гэтага сервера"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Вызначыць MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Вызначыць паведамленне дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Паказаць _кансоль XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Абнавіць MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Абнавіць паведамленне дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Адміністратар"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Спісы прыватнасці"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "Ад_правіць паведамленне серверу"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "Ад_правіць асобнае паведамленне"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " вакно / картка размовы з гэтым чалавекам адкрыта  "
@@ -594,7 +773,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Умовы</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Гукі</b>"
 
@@ -611,8 +790,7 @@ msgid "All statuses"
 msgstr "Усе станы"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Сышоў"
 
@@ -629,7 +807,7 @@ msgid "Have "
 msgstr "Мае "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Нябачны"
 
@@ -638,7 +816,7 @@ msgid "Launch a command"
 msgstr "Выканаць загад"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Мяне няма"
 
@@ -679,8 +857,11 @@ msgid "When "
 msgstr "Калі "
 
 #: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Скарыстаць здольнасць UrgencyHint, каб вакно размовы міргала на панэлі заданняў"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Скарыстаць здольнасць UrgencyHint, каб вакно размовы міргала на панэлі "
+"заданняў"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
@@ -741,41 +922,53 @@ msgid "when I'm in"
 msgstr "калі я ў"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Рамэа і Джульета</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Уваход:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Назва крыніцы:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Апошняя змена:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Атрыманае новае паведамленне"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Старыя казкі"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Маналог"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Вы атрымалі новае паведамленне:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Людзі"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Паведамленні аб змене стану</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Паведамленні аб змене стану</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Гукі</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Змяніць пароль"
@@ -805,10 +998,9 @@ msgid "Join _Group Chat"
 msgstr "Удзельнічаць у _групавой размове"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Дадаць у кантактны ліст"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -828,39 +1020,70 @@ msgid "_Open Link in Browser"
 msgstr "_Адкрыць у праглядальніку"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Пачаць размову"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Пстрыкніце, каб праглядзець былыя размовы з гэтым чалавекам"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Людзі"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Адправіць _файл"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Пераключыць шыфраванне Open_PGP"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Пераключыць шыфраванне Open_PGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Кампактны выгляд    Alt+К"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Дадаць у кантактны ліст"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Журнал"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "За_прасіць"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Назіральнікі"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Запоўніце форму."
@@ -873,6 +1096,24 @@ msgstr "Настаўленні пакоя"
 msgid "Edit Groups"
 msgstr "Змяніць групы"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Апісанне</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Здольнасці сервера"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
@@ -914,15 +1155,18 @@ msgid "Shows a list of file transfers between you and others"
 msgstr "Паказаць спіс перадаваных і атрыманых файлаў"
 
 #: ../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 "Выдаліць адзін файл з чаргі перадачы. Калі яшчэ адбываецца перадача, яна спыняецца, а потым выдаляецца"
+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
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Працягнуць"
 
@@ -930,8 +1174,7 @@ msgstr "_Працягнуць"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Адкрыць дырэкторыю з файлам"
 
@@ -979,7 +1222,7 @@ msgstr "Настаўленне тэмы Gajim"
 msgid "Gone"
 msgstr "Знік"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Неактыўны"
 
@@ -1020,58 +1263,72 @@ msgid "_Background:"
 msgstr "_Фон:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Змяніць м_янушку"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Змяніць _тэму"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Пстрыкніце, каб праглядзець былую размову ў гэтым пакоі"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Настаўленні _пакоя"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Настаўленні _пакоя"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Змясціць у закладках"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Змясціць у закладках"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Ма_дэратар"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Дзеянні ўдзельнікаў"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Адміністратар"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Забараніць казанне"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Выкінуць"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Удзельнік"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Дзеянні ўдзельнікаў"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Уладальнік"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "Ад_правіць прыватнае паведамленне"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Голас"
 
@@ -1079,85 +1336,84 @@ msgstr "_Голас"
 msgid "Create new post"
 msgstr "Стварыць новы допіс"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Ад"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Тэма"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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 ""
 "<big><b>Gajim - Кіраўнік журналаў размоў</b></big>\n"
 "\n"
-"Вы можаце выбраць адзін з журналаў на левай панэлі альбо адшукаць у базе дадзеных.\n"
+"Вы можаце выбраць адзін з журналаў на левай панэлі альбо адшукаць у базе "
+"дадзеных.\n"
 "\n"
 "<b>Увага:</b>\n"
-"Калі Вы хочаце здзейсніць масавую чыстку журналаў, закрыйце Gajim. Не выдаляйце журналы размоў з людзьмі, з якімі Вы зараз размаўляеце."
+"Калі Вы хочаце здзейсніць масавую чыстку журналаў, закрыйце Gajim. Не "
+"выдаляйце журналы размоў з людзьмі, з якімі Вы зараз размаўляеце."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim - Кіраўнік журналаў размоў"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Экспартаваць"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim - Кіраўнік журналаў размоў"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Пошук у базе дадзеных"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Стварыць адмысловы запыт"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Журнал размоў"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Стварэнне запыту..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Пошук"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "П_ошук"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Прыняць"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Адмовіць"
+#, fuzzy
+msgid "Search:"
+msgstr "Пошук"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Атрыманае запрашэнне"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Весці журнал размоў"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1149
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
@@ -1166,14 +1422,12 @@ msgid "Join this room automatically when I connect"
 msgstr "Увайсці ў гэты пакой па злучэнні"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Мянушка:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -1182,13 +1436,12 @@ msgid "Recently:"
 msgstr "Нядаўна:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Пакой:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Далучыцца"
 
@@ -1202,24 +1455,45 @@ msgstr "Аўтаматычна далучацца"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры запуску"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:3
 msgid "Manage Bookmarks"
 msgstr "Кіраванне закладкамі"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Стан друку:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Загаловак:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Настаўленні пакоя"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Уласцівасці</b>"
@@ -1229,47 +1503,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Настаўленні</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Злучэнне HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Кіраванне профілямі проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Імя:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Па_роль:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Тып:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Аўтарызацыя"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Вузел:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Дадаць чалавека ў спіс"
 
 #: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "Шыфраванне OpenPGP"
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Змясціць у закладках"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Дзеянні"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "Ад_правіць"
 
@@ -1285,36 +1597,77 @@ msgstr "<b>Адмысловы рэдактар настаўленняў</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Праграмы</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Дзеянні</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Адмысловы</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Змяніць правіла</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Фармат радка</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Колер картак</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Настаўленні GMail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Візуальныя нагадванні</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</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
+msgid "<b>Custom</b>"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Гукі</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Настаўленні GMail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Спіс прыватнасці</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Паведамленні аб змене стану</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Уласцівасці</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Візуальныя нагадванні</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Адмысловы"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Адмысловы"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1324,44 +1677,26 @@ msgstr ""
 "Толькі пісанне\n"
 "Адключана"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Дазволіць адпраўку звестак аб _сістэме"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
-
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Таксама вядома як \"стыль iChat\""
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-праграмай"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will use the default one set here"
-msgstr "Напрыклад, калі Вы ўключылі паведамленне стану для сышоўшага стану, Gajim больш не будзе ў Вас пытацца пацверджання гэтага паведамлення"
+msgstr ""
+"Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Запытацца аб паведамленні змены стану, калі я:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Аўтаматычна вызначаць пры кожным запуску Gajim\n"
@@ -1369,314 +1704,426 @@ msgstr ""
 "Заўсёды карыстацца праграмамі, прызначанымі ў KDE\n"
 "Адмысловы"
 
-#: ../data/glade/preferences_window.glade.h:29
-#: ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Размова"
-
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Скарыстайце гэтую опцыю, калі Вам надакучвае ці закідвае непатрэбнымі паведамленнямі нейкі чалавек, якога няма ў Вашым кантактным лісце. Але зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа адправіць Вам паведамленне"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid "Configure color and font of the interface"
-msgstr "Настаўленні колераў і шрыфтаў"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Стандартныя паведамленні стану"
+#, fuzzy
+msgid "Chat message:"
+msgstr "П_аведамленне стану:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Прадвызначаны набор _значак стану:"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
+"Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-"
+"праграмай"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Настаўленні колераў і шрыфтаў"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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"
-"Асобнае паведамленне"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Паказаць _падрабязнасці пошты"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Паказваць _стан у галоўным вакне"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "_Паказваць нагадванні стану размовы:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "_Кожныя 5 хвілінаў"
+msgid "Display _extra email details"
+msgstr "Паказаць _падрабязнасці пошты"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Сымболікі:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Падзеі"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: ../data/glade/preferences_window.glade.h:44
-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 можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. Вызначце, аб якіх зменах стану Вы хочаце ведаць."
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: ../data/glade/preferences_window.glade.h:45
-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 "Display status _messages of contacts in roster"
+msgstr "Паказваць _стан у галоўным вакне"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim will automatically show new events by popping up the relative window"
-msgstr "Gajim аўтаматычна пакажа новыя падзеі ў адпаведным выплыўным вакне"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
+"Вызначце, аб якіх зменах стану Вы хочаце ведаць."
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim будзе паведамляць Вам аб новых падзеях у выплыўным вакне ў правым верхнім куце экрана"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
+"Вызначце, аб якіх зменах стану Вы хочаце паведамляць суразмоўцу."
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim будзе паведамляць Вам аб увайшоўшых людзях у выплыўным вакне ў правым верхнім куце экрана"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым верхнім куце экрана"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым "
+"верхнім куце экрана"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim толькі зменіць значку чалавека, які стаў прычынай новай падзеі"
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Схаваць кнопкі групавой размовы."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: ../data/glade/preferences_window.glade.h:52
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку новых лістоў"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
+"новых лістоў"
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў групавых размовах"
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:54
-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 change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:55
-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 "Калі гэтая опцыя ўключаная, Gajim запомніць пазіцыю галоўнага і іншых вокнаў і іх памеры"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../data/glade/preferences_window.glade.h:56
-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 checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
+"кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Калі гэтая опцыя ўключаная, Gajim заменіць ascii-сымболікі (напр., ':)' ) адпаведнай значкай"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ігнараваць афармленне ўваходных паведамленняў"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../data/glade/preferences_window.glade.h:59
-msgid "Ma_nage..."
-msgstr "Кі_раванне..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../data/glade/preferences_window.glade.h:60
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Скарыстайце гэтую опцыю, калі Вам надакучвае ці закідвае непатрэбнымі "
+"паведамленнямі нейкі чалавек, якога няма ў Вашым кантактным лісце. Але "
+"зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа "
+"адправіць Вам паведамленне"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
-"Ніколі\n"
-"Заўсёды\n"
-"Па рахунках\n"
-"Па тыпе"
+"Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
+"новых лістоў"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Паведамляць мне аб людзях, якія: "
+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/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Паведамляць аб новай пошце на _Gmail"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "Для кожнага _паведамлення"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim заменіць ascii-сымболікі (напр., ':)' ) "
+"адпаведнай значкай"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "_Вакно для аднаго паведамлення:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Адпраўляць _нагадванні стану размовы:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Вакно для аднаго паведамлення:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Граць _гук"
+msgid "Ma_nage..."
+msgstr "Кі_раванне..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Уласцівасці"
+#, fuzzy
+msgid "Notifications"
+msgstr "Змяненне рахунка"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Паказваць час:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Паведамляць мне аб людзях, якія: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Захоўваць _пазіцыю і памеры галоўнага і размоўных вокнаў"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Паведамляць мне аб людзях, якія: "
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Выстаўляць паведамленне стану з улікам _гранай музыкі"
+msgid "Notify on new _GMail email"
+msgstr "Паведамляць аб новай пошце на _Gmail"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Паказваць толькі ў _галоўным вакне"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Асабістыя звесткі"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "_Злучыцца"
+msgid "Play _sounds"
+msgstr "Граць _гук"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "З_ысці"
-
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі гэтая опцыя ўключаная, Gajim будзе паказваць нефарматаваны тэкст."
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Status"
-msgstr "Стан"
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "Т_эма:"
+msgid "Preferences"
+msgstr "Уласцівасці"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Паведамленне аб аўтаматычным сыходзе"
+msgid "Sign _in"
+msgstr "_Злучыцца"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Паведамленне аб аўтаматычнай недаступнасці"
+msgid "Sign _out"
+msgstr "З_ысці"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Лічыць усе ўваходныя паведамленні:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі "
+"гэтая опцыя ўключаная, Gajim будзе паказваць нефарматаваны тэкст."
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Ужыць _значкі транспартаў"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Упарадкаваць людзей па стане"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Ужыць _сістэмны"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Стан"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Значка панэлі паведамленняў"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Прадвызначаны набор _значак стану:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Магчымыя наступныя варыянты нагадвання аб здзяйсненні новых падзей (паведамленне, запыт на перадачу файла і г.д.). Зважайце, што атрыманне новага паведамлення фіксуецца толькі тады, калі Вы атрымліваеце паведамленне ад чалавека, з якім на той момант яшчэ не вялася размова"
+#, fuzzy
+msgid "Style"
+msgstr "Марнаванне часу"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Па атрыманні новай падзеі"
+msgid "T_heme:"
+msgstr "Т_эма:"
 
 #: ../data/glade/preferences_window.glade.h:88
-msgid "Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr "Працуе з Rhythmbox і Muine. Для іншых праграмаў глядзіце старонку http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Адмысловыя настаўленні нагадванняў..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Гартач:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Ужыць _значкі транспартаў"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Кіраўнік файлаў:"
+msgid "Use system _default"
+msgstr "Ужыць _сістэмны"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Шрыфт:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Па атрыманні новай падзеі"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Фарбаваць няправільна напісаныя словы"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
+msgid "_Browser:"
+msgstr "_Гартач:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "_Уваходнае паведамленне:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "_Паказваць нагадванні стану размовы:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Сымболікі:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Паштовая праграма:"
+msgid "_File manager:"
+msgstr "_Кіраўнік файлаў:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Ніколі"
+msgid "_Highlight misspelled words"
+msgstr "_Фарбаваць няправільна напісаныя словы"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Паведамляць мне пра гэта"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Адкрыць..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ігнараваць афармленне ўваходных паведамленняў"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "_Выходнае паведамленне:"
+msgid "_Incoming message:"
+msgstr "_Уваходнае паведамленне:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Прайгравальнік:"
+msgid "_Log status changes of contacts"
+msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Вынырваць"
+msgid "_Mail client:"
+msgstr "_Паштовая праграма:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "_Вярнуць звычайныя колеры"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Упарадкаваць людзей па стане"
+msgid "_Open..."
+msgstr "_Адкрыць..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "П_аведамленне стану:"
+msgid "_Outgoing message:"
+msgstr "_Выходнае паведамленне:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_Спасылка:"
+msgid "_Reset to Default Colors"
+msgstr "_Вярнуць звычайныя колеры"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "_Паказваць нагадванні стану размовы:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "П_аведамленне стану:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Удзельнічаць у _групавой размове"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Няма ў спісе"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "хвіліны"
 
@@ -1712,6 +2159,10 @@ msgstr "Усе"
 msgid "Allow"
 msgstr "Дазволіць"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Адмовіць"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1720,8 +2171,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1863
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
@@ -1761,142 +2211,177 @@ msgstr "адпраўляць мне паведамленні аб змене с�
 msgid "to view my status"
 msgstr "бачыць мой стан"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Дадаць правіла</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Пра мяне"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Аватар:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Адрас"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Народзіны:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Аватар:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Народзіны:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Горад:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Кампанія:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Краіна:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Аддзел:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-mail:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Дадатковы адрас:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Прозвішча:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Фармат: ГГГГ-ММ-ДД"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Адмысловы</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Дадзенае імя:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "У Сеціве:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Дадаць правіла</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Адмысловы</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Мянушка:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Сярэдняе:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Тэлефонны нумар:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Яшчэ"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Умовы</b>"
+
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Паштовы індэкс:"
 
+#. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Асабістыя звесткі"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Уласцівасці</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Тэлефонны нумар:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Настаўленні</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Пазіцыя:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Паштовы індэкс:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Настаўленні</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Прэфікс:"
+#, 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:38
-#: ../src/vcard.py:273
-msgid "Role:"
-msgstr "Роля:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Пра мяне"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Штат:"
+msgid "Click to set your avatar"
+msgstr "Пстрыкніце, каб вызначыць свой аватар"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Вуліца:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Фармат: ГГГГ-ММ-ДД"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Суфікс:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Асабістыя звесткі"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Праца"
 
@@ -1912,79 +2397,128 @@ msgstr "Выдаліць рахунак _толькі для Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "Вы_даліць"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Спытацца _дазволу праглядаць змены стану"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Дадаць спецыяльнае _нагадванне"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Прызначыць ключ Open_PGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Змяніць _групы"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Выканаць загад..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "За_прасіць"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Адправіць _асобнае паведамленне"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "Вы_даліць"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Адправіць асаблівы XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Адправіць _асобнае паведамленне..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Адправіць _файл"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Пачаць _размову"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Дазволіць чалавеку _бачыць змены майго стану"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Забараніць праглядаць змены майго стану"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028
-#: ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "Вы_даліць з кантактнага ліста"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Змяніць імя чалавека"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "Змяніць _імя"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "П_адпіска"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "дзевяць"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "Р_ахункі"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Дадаць чалавека..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Дадаць _чалавека"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Здольнасці сервера"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -1998,52 +2532,91 @@ msgstr "Частыя пытанні (у Сеціве)"
 msgid "Help online"
 msgstr "Дапамога ў Сеціве"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Профіль, а_ватар"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Паказаць _транспарты"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Паказаць _галоўнае вакно"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Змест"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Рахункі"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Пошук сервісаў"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Дзеянні"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1256
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Змест"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_Частыя пытанні"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Настаўленні"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Выйсці"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Адправіць _асобнае паведамленне..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Выгляд"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Пошук"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Дадаць _чалавека"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Асабістыя звесткі"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "П_ошук"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Ісці"
@@ -2052,10 +2625,6 @@ msgstr "_Ісці"
 msgid "_Address:"
 msgstr "_Адрас:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Фільтар:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Зарэгістравацца"
@@ -2117,7 +2686,9 @@ msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Аўтарызаваць чалавека, каб ён мог бачыць, калі Вы далучаны"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr "Забраць аўтарызацыю ў чалавека, каб ён не мог бачыць, калі Вы далучаны"
 
 #: ../data/glade/subscription_request_window.glade.h:4
@@ -2128,10 +2699,31 @@ msgstr "Запыт падпіскі"
 msgid "_Deny"
 msgstr "_Адмовіць"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Паказаць нягледжаныя _падзеі"
@@ -2144,58 +2736,73 @@ msgstr "Паказаць _галоўнае вакно"
 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:5
-msgid "Ask:"
-msgstr "Запыт:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Дзеянні</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Праграма:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Рэсурс:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Настаўленні</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Апісанне</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Адмысловы</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Каментарыі"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Настаўленні _пакоя"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Чалавек"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "Аперацыйная сістэма:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Рэсурс:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Стан:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Падпіска:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Яшчэ"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Весці журнал размоў"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Аватар:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2205,11 +2812,6 @@ msgstr "<b>Трафік Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Увод XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Уключыць"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2228,15 +2830,29 @@ msgstr "_Паведамленне"
 msgid "_Presence"
 msgstr "_Прысутнасць"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Імя:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Дадаць спецыяльнае _нагадванне"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Прозвішча:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Прызначыць ключ Open_PGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Змяніць _групы"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "Змяніць _імя"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Змяніць рахунак..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2246,530 +2862,3253 @@ msgstr "Мясцовы jid:"
 msgid "Personal"
 msgstr "Асабістае"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n"
-"Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Рэсурс:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Стан:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Змяніць рахунак"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Адмысловы порт:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Асабістыя звесткі"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Актывізаваны"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Неактывізаваны"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Лагічнае"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Цэлы лік"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Колер"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Назва ўласцівасці"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Значэнне"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Тып"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:137
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Няма)"
 
-#. we talk about password
-#: ../src/advanced.py:240
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Схаваны"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Ангельская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Беларуская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Балгарская"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Брытонская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Чэшская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Грэцкая"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Брытанская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Эсперанта"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Іспанская"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Басцкая"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Французская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Харвацкая"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Італійская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Нарвежская (бокмал)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Галандская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Нарвежская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Польская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Партугальская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Бразільская партугальская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Расейская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Нямецкая"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Славацкая"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:208
-#: ../src/dialogs.py:1517
-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 export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Калі гэта не мова, для якой трэба паказваць няправільна напісаныя словы, тады вызначце зменную $LANG адпаведным чынам. Напр., для беларускай мовы змясціце загад export LANG=be_BY.UTF-8 у файле ~/.bash_profile, альбо глабальна ў /etc/profile.\n"
-"\n"
-"Фарбаванне няправільна напісаных слоў не працуе"
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:270
-#: ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:271
-#: ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:852
-msgid "Chats"
-msgstr "Размовы"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Шыфраванне дзейнічае"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Няма ў спісе"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
 
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" выконвае %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Шыфраванне адключанае"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Аўтарызацыя"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+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:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s не распаўсюджвае ключ OpenPGP і не мае прызначанага ключа"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Шыфраванне дзейнічае"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Загады: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
+"асобы). (напр., /%s рагоча як конь.)"
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Даведка па /%s адсутнічае"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Гэтае паведамленне зашыфраванае]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1406
-#: ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:785
-#: ../src/gajim.py:786
-#: ../src/gajim.py:1130
-#: ../src/roster_window.py:332
-#: ../src/roster_window.py:410
-#: ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508
-#: ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890
-#: ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900
-#: ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73
-#: ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "Няма ў спісе"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Гэтае паведамленне зашыфраванае]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:1551
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае паведамленне згубіцца."
+#: ../src/chat_control.py:2226
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
+"паведамленне згубіцца."
+
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
 
-#: ../src/config.py:137
-#: ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s цяпер %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "стварэнне базы журналаў"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim сканчвае работу"
+
+#: ../src/common/check_paths.py:136
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "стварэнне дырэкторыі %s"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Змяніць звесткі аб стане"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Змяніць стан"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Выставіць тып прысутнасці і апісанне"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Вольны для размовы"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "У сетцы"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Пашыраны рэжым адсутнасці"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Не турбаваць"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Адлучаны - па-за сеткай"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Апісанне прысутнасці:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Стан змяніўся."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Сысці з групавых размоў"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s на %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Вы не ўвайшлі ў пакой групавой размовы."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Выберыце групавыя размовы, з якіх Вы хочаце сысці"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Групавыя размовы"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Вы сышлі з наступных групавых размоў:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d нечытанае паведамленне"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Паказваць нагадванні праз DBus і Notification-Daemon"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Праз колькі хвілінаў змяняць стан на сышоўшы."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Сышоў як вынік марнавання часу"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Праз колькі хвілінаў змяняць стан на недаступны."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Недаступны ў выніку марнавання часу"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Прадвызначана"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Дазволіць мясцовыя паведамленні"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Мова правапісу"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - паказваць час кожнага паведамлення.\n"
+"'sometimes' - паказваць час кожныя print_ichat_every_foo_minutes хвілінаў.\n"
+"'never' - не паказваць час."
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Паказваць час у вокнах размовы прыблізна. Значэнне прыблізнасці ад 1 да 4, "
+"альбо 0, каб адключыць прыблізнасць. 1 паказвае самы дакладны час, 4 "
+"паказвае самы прыблізны. Працуе, калі опцыя print_time мае значэнне "
+"'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Лічыць спалучэнні * / _  мажлівымі знакамі фарматавання."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не "
+"выдаляецца."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Ужыць рэструктураваную мову тэкставай разметкі для адпраўлення HTML, а "
+"таксама фарматаванне ASCII, калі ўключаная адпаведная опцыя. Глядзіце "
+"сінтаксіс на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext."
+"html (калі Вы хочаце ўжыць гэтую магчымасць, усталюйце docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr "Знак пасля вызначанай мянушкі, калі яе згадваюць у групавой размове."
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"З дапамогай гэтай опцыі Вы можаце змяніць фармат часавых мецінаў, якія "
+"паказваюцца ў вокнах размовы. Напр., \"[%H:%M] \" азначае, што трэба "
+"паказваць \"[гадзінаў:хвілінаў] \". Глядзіце падрабязную інфармацыю ў "
+"дакументацыі для python на функцыю strftime: http://docs.python.org/lib/"
+"module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Дадаць * і [n] у назву галоўнага вакна?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Колькі хвілінаў апошняй размовы паказваць у новых размовах."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
+"(стандартныя паводзіны Mirabilis ICQ)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
+"што значыць выкарыстанне Вікі-Слоўніка."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-"
+"remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Калі true, чакаць сігналаў D-Bus ад NetworkManager і змяняць стан рахункаў "
+"(для якіх опцыя listen_to_network_manager не выстаўленая ў False і якія "
+"сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
+"composing_only, disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
+"composing_only, disabled."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Калі трэба паказваць час не для кожнага паведамлення "
+"(print_time==sometimes), паказваць яго кожныя x хвілінаў."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Пытацца пацверджання закрыцця групавой размовы."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Заўсёды пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
+"падзеленых прагаламі назваў групавых размоў."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Ніколі не пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
+"падзеленых прагаламі назваў групавых размоў."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / "
+"перанакіравання портаў."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Паказваць картку, калі актыўная толькі адна размова?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Паказваць межы картак у вокнах размовы?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Паказваць кнопку закрыцця на картцы?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых "
+"размовах."
+
+#: ../src/common/config.py:219
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
+"настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Калі true, Gajim будзе пры запуску спраўджваць, ці з'яўляецца ён "
+"прадвызначанай Jabber-праграмай."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі "
+"паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr "Калі true, Gajim паказвае стан у галоўным вакне для кожнага чалавека"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Калі true, Gajim будзе адпраўляць запыт на атрыманне аватара кожнаму "
+"чалавеку, хто не меў усталяванага аватара ў апошні сеанс, ці чый аватар "
+"надта стары."
+
+#: ../src/common/config.py:229
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"магчымыя значэнні: \"none\", \"all\" альбо \"in_and_out\". Калі опцыя "
+"выстаўленая ў \"none\", Gajim не будзе паказваць паведамленні аб змене стану "
+"суразмоўцаў у вакне размовы. Калі опцыя выстаўленая ў \"all\", Gajim будзе "
+"паказваць усе такія паведамленні. Калі опцыя выстаўленая ў \"in_and_out\", "
+"Gajim будзе паказваць толькі паведамленні аб сыходзе / ўваходзе суразмоўцы."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Фонавы колер для толькі сышоўшых людзей."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Калі true, адноўленыя з папярэдняга сеанса паведамленні будуць мець меншы "
+"памер шрыфта."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Не паказваць аватар для транспарта."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Калі true і калі ўсталяваныя GTK+ і PyGTK версіі, вышэйшай за 2.8, міргаць "
+"вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
+"нягледжаных падзей."
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 не любіць звесткі sha, калі чалавек заходзіць у абароненую "
+"паролем групавую размову. Змяніце значэнне гэтай опцыі на False, каб "
+"перастаць адпраўляць звесткі sha у групавыя размовы"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Вызначае вакно для новых паведамленняў.\n"
+"'always' - Усе паведамленні адпраўляюцца ў адзінае вакно.\n"
+"'never' - Усе паведамленні адпраўляюцца ў асобныя вокны.\n"
+"'peracct' - Паведамленні ад кожнага рахунка адпраўляюцца ў асобнае вакно.\n"
+"'pertype' - Паведамленні аднаго тыпу (напр., прыватныя і групавыя) "
+"адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
+"пасля перазапуску праграмы."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Калі false, не паказваць аватары ў вакне размовы."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Калі true, клавіша Escape закрывае картку / вакно."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Схаваць кнопкі групавой размовы."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Хавае банер у групавой размове"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Хавае банер у прыватнай размове"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Схаваць спіс удзельнікаў групавой размовы."
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
+"напісаў той самы чалавек."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Адправіць паведамленне і закрыць вакно"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr "Спіс колераў для фарбавання мянушак у групавой размове."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
+"радок адключае гэтае вакно."
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Калі true, Вы зможаце выставіць для рахунка адмоўны прыярытэт. Увага: калі "
+"Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
+"ад Вашага сервера."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
+"пароляў Gnome Keyring (калі ўсталяваны)."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
+"людзей і агульную колькасць у радках групаў і рахункаў."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то "
+"лічыць усе ўваходныя паведамленні гэтага тыпу"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
+"опцыях autopriority_*."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Выпраўленне хібы Jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
+"выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Мова праверкі правапісу"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "усе ці падзеленыя прагаламі станы"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no' ці 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' ці ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Сон"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Хутка буду"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Хутка буду."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Ежа"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Ямо, пакіньце мне паведамленне."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Фільм"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Гляджу фільм."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Працую"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Працую."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Тэлефон"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Я на тэлефоне."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Сышоў"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Я цешуся з жыцця."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Я даступны."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Я магу размаўляць."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Хутка прыйду."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Мяне няма."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Не турбаваць."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Бывай!"
+
+#: ../src/common/config.py:441
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Прайграць гэты гук, калі прыходзіць групавое паведамленне з адным з слоў, "
+"вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
+"ўтрымлівае Вашую мянушку."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Прайграць гук пры атрыманні паведамлення MUC."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "зялёны"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "садавіна"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "чалавек"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "мора"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Немагчыма загрузіць модуль idle"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Няправільны вузел"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Пашырэнне не падтрымліваецца"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Такая мянушка не дазволеная: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Немагчыма ўвайсці ў групавую размову"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вам забаронена казанне ў гэтай групавой размове."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Такой групавой размовы няма."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Стварэнне групавых размоў абмежаванае."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Вас няма ў спісе ўдзельнікаў."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Аўтарызацыя забраная"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Я хачу дадаць Вас у мой кантактны ліст."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "цяпер падпісаны на %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "запыт адпіскі ад %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "цяпер адпісаны ад %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s не адпавядае стандарту RFC. Ён не будзе дададзены ў кантактны ліст. "
+"Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio."
+"org/"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Пароль OpenPGP не вызначаны"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Немагчыма загрузіць модуль idle"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Злучэнне для рахунка \"%s\" згубленае"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Перадалучыцеся самастойна."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Няправільны адказ"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Памылка злучэння"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Немагчыма злучыцца з \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Немагчыма злучыцца з \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Злучэнне для рахунка \"%s\" згубленае"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Праверце злучэнне альбо паспрабуйце пазней"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Памылка аўтарызацыі з \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Праверце звесткі аўтарызацыі."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Памылка ў часе выдалення спіса прыватнасці"
+
+#: ../src/common/connection.py:801
+#, fuzzy, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
+"злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тэма: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Не атрымана з-за нябачнага стану"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Назіральнікі"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Транспарты"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Няма ў спісе"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Файлы падтрымкі python для D-Bus адсутнічаюць на гэтым кампутары"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Немагчыма скарыстаць D-Bus для Gajim"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "Залежнасць ад pysqlite2 (aka python-pysqlite2) не выкананая. Выхад..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Назва рахунка не павінна быць пустой."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Сервіс недаступны: Gajim не працуе, альбо remote_control мае значэнне False"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Шына сеанса недаступная.\n"
+"Чытайце http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "адзін"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "два"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "тры"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "чатыры"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "пяць"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "шэсць"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "сем"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "восем"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "дзевяць"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "дзесяць"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "адзінаццаць"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "дванаццаць"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 гадзінаў"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "пяць хвілінаў на $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "дзесяць хвілінаў на $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "чвэрць на $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "дваццаць хвілінаў на $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "дваццаць пяць хвілінаў на $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "палова на $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "без дваццаці пяці хвілінаў $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "без дваццаці хвілінаў $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "без чвэрці $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "дзесяць хвілінаў на $s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "без пяці хвілінаў $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "%1 гадзінаў"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Ноч"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Світанак"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Раніца"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Амаль дзень"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Полудзень"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Абед"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Вечар"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Позні вечар"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Пачатак тыдня"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Сярэдзіна тыдня"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Канец тыдня"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Выходныя!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Няправільны знак у імені карыстальніка."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Патрэбны адрас сервера."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Няправільны знак у назве вузла."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Няправільны знак у назве рэсурса."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s ГіБ"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s ГБ"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s МіБ"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s МБ"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s кiБ"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s кБ"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s Б"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Заняты"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Заняты"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "М_яне няма"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Магу размаўляць"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Магу размаўляць"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Тут"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Тут"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Злучэнне"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "Н_е тут"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Адключаны"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Адключаны"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Нябачны"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?чалавек у стане:Невядомы"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?чалавек у стане:Ёсць памылкі"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Ужо ёсць падпіскі:Няма"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Да"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Абодва"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Запыт (на падпіску):Няма"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Падпісацца"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Роля чалавека:Няма"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Мадэратары"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Мадэратар"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Удзельнікі"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Удзельнік"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Наведвальнікі"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Наведвальнік"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Уладальнік"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Адміністратар"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Удзельнік"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "сочыць за размовай"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "заняты чымсьці іншым"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "піша паведамленне..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "перастаў пісаць"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "закрыў вакно / картку размовы"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Адправіць паведамленне"
+msgstr[1] "Адправіць паведамленне"
+msgstr[2] "Адправіць паведамленне"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "памылка: немагчыма прачытаць %s"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "перанос базы журналаў у індэкс"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Рахунак Gajim %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Прыпынена"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Тлусты"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Мае "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Размовы"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Тлусты"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Змест"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Скончаная"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Змест"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Неактывізаваны"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "спасылка"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Выдаліць"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
 msgstr "Адключана"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Адключана"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Адключана"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Актывізаваны"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Група"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Вузел:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "паведамленне"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Актывізаваны"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Нябачны"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "адзін"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Вузел:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Нямецкая"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Змяніць"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Адключаны"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Група"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "адзінаццаць"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Марнаванне часу"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Апошняя змена:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Мянушка"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Сон"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Вуліца:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Падпісаны"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Час"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "дзевяць"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Няправільны вузел"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Вечар"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Піша"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Раніца"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "усе з групы"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Працую"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Вечар"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Пакаранне %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Далучыцца"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Працую"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Працую"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "пакой"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Ежа"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Змяненне тэмы"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Пакаранне %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Ежа"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Працую"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Пакаранне %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Ежа"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "З_ысці"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Ежа"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Прычына"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Прычына"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Сон"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Працую"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Ежа"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Гляджу фільм."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Ежа"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Я на тэлефоне."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Перадача"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Піша"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "У сетцы"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Адкрыць _спасылку"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Працую"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Піша"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Працую"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Кожныя %s _хвілінаў"
+msgid "Unable to bind to port %s."
+msgstr "Немагчыма адкрыць порт %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў скасаваная."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму "
+"ігнаруецца."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Памылка Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Мясцовыя паведамленні могуць не працаваць."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Праверце, ці ўсталяваны Avahi."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Немагчыма стартаваць мясцовы сервіс"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Немагчыма злучыцца праз порт %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Праверце, ці працуе avahi-daemon."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Немагчыма змяніць стан рахунка \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць паведамленне."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Гэтае паведамленне зашыфраванае]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Памылка дадання сервіса. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Адключана"
 
-#: ../src/config.py:353
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:684
-#: ../src/gajim.py:2165
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Стандартныя паведамленні стану"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Уключыць"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Адмысловы</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:685
-#: ../src/gajim.py:2166
+#: ../src/config.py:651
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць іншую мову праз опцыю speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
+"іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
 
-#: ../src/config.py:1046
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Атрыманае наступнае паведамленне"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
 
-#: ../src/config.py:1261
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Назва"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Перадалучыцца?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Нягледжаныя падзеі"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Вы пачалі размову ў рахунку %s"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1311
-#: ../src/config.py:1905
-msgid "Unread events"
-msgstr "Нягледжаныя падзеі"
-
-#: ../src/config.py:1312
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
-msgstr "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
+msgstr ""
+"Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1316
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1317
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1717
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1321
-#: ../src/config.py:1325
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1322
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1326
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:1334
-#: ../src/config.py:1340
-#: ../src/config.py:1350
-#: ../src/config.py:3013
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Кіраванне рахункамі"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Вызначце новую назву групы %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
 
-#: ../src/config.py:1341
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:1400
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:1401
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:1529
-#: ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Хутка прыйду."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:1539
-msgid "Relogin now?"
-msgstr "Перадалучыцца?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:1540
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
+#: ../src/config.py:2076
+msgid "OpenPGP Key Selection"
+msgstr "Выбар ключоў OpenPGP"
+
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:1567
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:1574
-#: ../src/dialogs.py:1131
-#: ../src/dialogs.py:1317
-#: ../src/disco.py:417
-#: ../src/profile_window.py:313
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/config.py:1575
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:1579
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:1580
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:1604
-#: ../src/config.py:3401
-msgid "Failed to get secret keys"
-msgstr "Немагчыма атрымаць сакрэтныя ключы"
-
-#: ../src/config.py:1605
-#: ../src/config.py:3402
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
-
-#: ../src/config.py:1608
-#: ../src/config.py:3405
-msgid "OpenPGP Key Selection"
-msgstr "Выбар ключоў OpenPGP"
-
-#: ../src/config.py:1609
-#: ../src/config.py:3406
-msgid "Choose your OpenPGP key"
-msgstr "Выберыце Ваш ключ OpenPGP"
-
-#. Name column
-#: ../src/config.py:1839
-#: ../src/disco.py:741
-#: ../src/disco.py:1467
-#: ../src/disco.py:1705
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Назва"
-
-#: ../src/config.py:1842
-msgid "Server"
-msgstr "Сервер"
-
-#: ../src/config.py:1906
-msgid "Read all pending events before removing this account."
-msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
-
-#: ../src/config.py:1943
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Вы пачалі размову ў рахунку %s"
-
-#: ../src/config.py:1944
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
-
-#: ../src/config.py:2003
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2004
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
+msgstr ""
+"Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2238
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2240
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2312
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2348
-#: ../src/disco.py:748
-#: ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2365
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2388
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2777,11 +6116,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2390
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2391
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2789,11 +6128,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2393
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2394
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2801,11 +6140,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2397
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2813,7 +6152,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2829,369 +6168,487 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2503
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2520
-#: ../src/roster_window.py:2733
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2521
-#: ../src/roster_window.py:2729
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2522
-#: ../src/roster_window.py:2734
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2536
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2537
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:2624
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:2692
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:2725
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:2726
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2792
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
-#: ../src/config.py:2988
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:2989
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
-msgstr "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага рахунка."
-
-#: ../src/config.py:2999
-#: ../src/dialogs.py:1336
-msgid "Invalid password"
-msgstr "Няправільны пароль"
-
-#: ../src/config.py:3000
-msgid "You must enter a password for the new account."
-msgstr "Вы павінны ўвесці пароль для новага рахунка."
-
-#: ../src/config.py:3004
-#: ../src/dialogs.py:1341
-msgid "Passwords do not match"
-msgstr "Паролі розняцца"
-
-#: ../src/config.py:3005
-#: ../src/dialogs.py:1342
-msgid "The passwords typed in both fields must be identical."
-msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
+msgstr ""
+"Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
+"рахунка."
 
-#: ../src/config.py:3024
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Паўторны Jabber ID"
 
-#: ../src/config.py:3025
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Гэты рахунак ужо выкарыстоўваецца ў Gajim."
 
-#: ../src/config.py:3042
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3043
-#: ../src/config.py:3078
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Вы можаце зараз змяніць адмысловыя настаўленні, націснуўшы кнопку \"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць\" галоўнага вакна."
+#: ../src/config.py:3119 ../src/config.py:3308
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Вы можаце зараз змяніць адмысловыя настаўленні, націснуўшы кнопку "
+"\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
+"\" галоўнага вакна."
 
-#: ../src/config.py:3077
-msgid "Your new account has been created successfully"
-msgstr "Новы рахунак паспяхова створаны"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Вызначце сваю новую мянушку:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Чалавек ужо ёсць у кантактным лісце"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3153
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Новы рахунак паспяхова створаны"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/conversation_textview.py:271
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:712
 #, 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:386
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Учора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i дзён таму"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:790
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber-праграма"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Імя чалавека: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "У групе"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Імя чалавека"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Вызначыць MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Паведамленне аб змене стану"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Захаваць гэтае паведамленне аб змене стану"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Адрас AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Нумар GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Нумар ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Адрас MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Адрас Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка %s"
+msgstr ""
+"Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
+"%s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Я хачу дадаць Вас у мой кантактны ліст."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 msgid "Last but not least, we would like to thank all the package maintainers."
-msgstr "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай для розных сістэмаў."
+msgstr ""
+"Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
+"для розных сістэмаў."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:779
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:909
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Немагчыма адкрыць порт %s."
-
-#: ../src/dialogs.py:910
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў скасаваная."
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
+"іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1061
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:1064
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:1124
-#: ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:1132
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
-msgstr "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
+msgstr ""
+"Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:1215
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:1216
-#: ../src/dialogs.py:1222
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:1229
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:1268
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Сервер"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Рахунак \"%s\" злучаны з серверам"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr ""
+"Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:1271
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3200,522 +6657,844 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1296
-#: ../src/dialogs.py:1655
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:1297
-#: ../src/dialogs.py:1656
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:1306
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:1318
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1337
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Няправільны пароль"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Паролі розняцца"
+
+#: ../src/dialogs.py:2025
+msgid "The passwords typed in both fields must be identical."
+msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1384
-#: ../src/notify.py:211
-#: ../src/notify.py:415
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: ../src/dialogs.py:1386
-#: ../src/notify.py:219
-#: ../src/notify.py:417
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #. chat message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:238
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Новае паведамленне"
 
 #. single message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:223
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
 #. private message
-#: ../src/dialogs.py:1389
-#: ../src/notify.py:230
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: ../src/dialogs.py:1389
-#: ../src/gajim.py:1225
-#: ../src/notify.py:428
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:1391
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:1393
-#: ../src/gajim.py:1197
-#: ../src/gajim.py:1354
-#: ../src/notify.py:424
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:1395
-#: ../src/gajim.py:1417
-#: ../src/gajim.py:1439
-#: ../src/gajim.py:1456
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/dialogs.py:1396
-#: ../src/gajim.py:1420
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:1398
-#: ../src/gajim.py:1094
-#: ../src/notify.py:430
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:1400
-#: ../src/notify.py:203
-#: ../src/notify.py:432
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:1587
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1592
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1615
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1687
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1688
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:1732
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Кансоль XML"
 
-#: ../src/dialogs.py:1857
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:1909
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:1912
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:2041
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:2139
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:2210
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Вы не ўвайшлі ў пакой групавой размовы."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:2328
-#: ../src/dialogs.py:2373
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:2363
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
 #. # means number
-#: ../src/dialogs.py:2508
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:2514
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:2635
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "калі я "
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Іншыя"
 
-#: ../src/disco.py:102
-#: ../src/disco.py:103
-#: ../src/disco.py:1253
-#: ../src/gajim.py:539
-#: ../src/roster_window.py:271
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:368
-#: ../src/roster_window.py:451
-#: ../src/roster_window.py:483
-#: ../src/roster_window.py:485
-#: ../src/roster_window.py:3896
-#: ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Транспарты"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Канферэнцыі"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
-msgstr "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
+msgstr ""
+"Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: ../src/disco.py:643
-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:657
+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:647
-#: ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: ../src/disco.py:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Праглядзець"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: ../src/disco.py:1143
-#: ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Выканаць загад..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук у %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Карыстальнікі"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Апісанне"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ніякі"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Кіраўнік журналаў"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Паведамленне адпраўленае"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Шыфраванне OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Уваходнае паведамленне:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Агульная"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Здольнасці сервера"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Час"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173
-#: ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Перадача файла скасаваная"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Атрымальнік: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Памылка: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Перадача файла спыненая чалавекам"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Выберыце файл..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Апісанне: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim не можа даступіцца да гэтага файла"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Гэтым файлам карыстаецца іншы працэс."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Апісанне: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:705
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:707
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
 msgstr "Файл з такой назвай ужо існуе, а Вы не маеце правоў на яго перазапіс."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:721
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:722
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Захаваць файл як..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3723,90 +7502,101 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/с)"
 
-#: ../src/filetransfers_window.py:544
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Няправільны файл"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/filetransfers_window.py:568
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Назва:"
 
-#: ../src/filetransfers_window.py:570
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim патрабуе запуску сервера X. Выхад..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ не падтрымлівае libglade"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
 msgstr "Выдаліце бібліятэку GTK+ і ўсталюйце найноўшую стабільную версію з %s"
 
-#: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:199
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Праверце, ці падтрымліваюць бібліятэкі GTK+ і PyGTK сродкі libglade."
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim патрабуе PySQLite2 для запуску"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim патрабуе pywin32 для запуску"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
 msgstr "Праверце, ці ўсталяваны Pywin32. Вы можаце сцягнуць яго з %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim ужо працуе"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3814,88 +7604,168 @@ msgstr ""
 "Gajim ужо працуе\n"
 "Усё роўна запусціць наноў?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Патрэбны пароль"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Вызначце пароль GPG для рахунка %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Няправільны пароль"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
+"Выберыце іншую мянушку:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gajim.py:393
-#: ../src/notify.py:434
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Хочаце задаволіць гэты запыт?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: ../src/gajim.py:710
-#, python-format
-msgid "Subject: %s"
-msgstr "Тэма: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:755
-#: ../src/gajim.py:768
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: ../src/gajim.py:801
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gajim.py:802
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gajim.py:810
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: ../src/gajim.py:811
-msgid "You will always see him or her as offline."
-msgstr "Вы заўсёды будзеце бачыць гэтага чалавека адключаным."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:854
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gajim.py:855
-#: ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s змяніў мянушку на %s"
 
-#: ../src/gajim.py:1004
-#: ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s цяпер %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s цяпер %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1007
-#: ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s цяпер %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1104
-msgid "Your passphrase is incorrect"
-msgstr "Пароль няправільны"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
 
-#: ../src/gajim.py:1105
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Пароль няправільны"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3903,341 +7773,536 @@ msgstr[0] "%d новы ліст"
 msgstr[1] "%d новыя лісты"
 msgstr[2] "%d новых лістоў"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1219
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Ад: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1444
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: ../src/gajim.py:1457
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Для кожнага _паведамлення"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gajim.py:1575
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Канфлікт імёнаў карыстальнікаў"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Злучэнне"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Больш не пытацца"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Шыфраванне адключанае"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: ../src/gajim.py:2113
-msgid "Network Manager support not available"
-msgstr "Падтрымка Network Manager адсутнічае"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/gajim.py:2188
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Падтрымка працоўных сеансаў адсутнічае (няма модуля gnome.ui)"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Закладка паспяхова дададзеная"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
+"вакна."
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Паказвае даведку па вызначаным загадзе"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "загад"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека друкуюцца на асобным радку"
-
-#: ../src/gajim-remote.py:85
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:188
-#: ../src/gajim-remote.py:197
-#: ../src/gajim-remote.py:204
-#: ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:222
-#: ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:247
+#: ../src/gajim-remote.py:95
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
+"друкуюцца на асобным радку"
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "рахунак"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "паведамленне"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: ../src/gajim-remote.py:100
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх рахункаў, якія \"сінхранізуюцца з глабальным станам\""
+#: ../src/gajim-remote.py:113
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
+"рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
+msgstr ""
+"Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: ../src/gajim-remote.py:115
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Адпраўляе новае паведамленне чалавеку з спіса. Выстаўленне ключа OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
+#: ../src/gajim-remote.py:128
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Адпраўляе новае паведамленне чалавеку з спіса. Выстаўленне ключа OpenPGP і "
+"рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
+"'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: ../src/gajim-remote.py:128
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Адпраўляе новае асобнае паведамленне чалавеку з спіса. Выстаўленне ключа OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
+#: ../src/gajim-remote.py:141
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Адпраўляе новае асобнае паведамленне чалавеку з спіса. Выстаўленне ключа "
+"OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', "
+"без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "тэма"
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID чалавека, які атрымае паведамленне"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Месца файла"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Дадаць чалавека ў спіс"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Дадаць новага чалавека для гэтага рахунка"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:209
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
+#: ../src/gajim-remote.py:231
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Адкрыць вакно 'Пачаць размову'"
 
-#: ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Пачаць размову для рахунка"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: ../src/gajim-remote.py:229
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе адпраўлены на ўсе рахункі"
+#: ../src/gajim-remote.py:251
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
+"адпраўлены на ўсе рахункі"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Апрацоўваць спасылкі xmpp:/"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "спасылка"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Увайсці ў размоўны пакой"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "пакой"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Пакой:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "мянушка"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Мянушка не знойдзеная: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "пароль"
 
 #: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Паролі розняцца"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Праверце, ці працуе avahi-daemon."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Паказаць / схаваць галоўнае вакно"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4246,29 +8311,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Карыстанне: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:358
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:362
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4277,950 +8344,1185 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: ../src/gajim-remote.py:439
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:443
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:461
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Няправільная спасылка"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тэма"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Вы не можаце выдаліць актыўную тэму"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "назва тэмы"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Вы не можаце выдаліць актыўную тэму"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Прыватная размова"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Прыватныя размовы"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:144
-msgid "Group Chat"
-msgstr "Групавая размова"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Групавыя размовы"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Журнал размоў"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Злучэнне"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Новы рахунак паспяхова створаны"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:1142
 #, 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:840
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(who)s пакараў %(nick)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Адносіны: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s змяніў мянушку на %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(who)s пакараў %(nick)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s пакараны: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: ../src/groupchat_control.py:1063
-#: ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174
-#: ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117
-#: ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s не з'яўляецца карэктным JID"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Такога загаду няма: /%s (калі Вы хочаце адправіць яго, устаўце перад тэкстам \"/say\")"
-
-#: ../src/groupchat_control.py:1251
-#, python-format
-msgid "Commands: %s"
-msgstr "Загады: %s"
-
-#: ../src/groupchat_control.py:1253
-#, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Карыстанне: /%s <мянушка|JID> [прычына], забараняе JID-у казанне для гэтай групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна не ўтрымлівае знака \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, ён таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
-
-#: ../src/groupchat_control.py:1260
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
-
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
-
-#: ../src/groupchat_control.py:1266
+#: ../src/groupchat_control.py:1656
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную прычыну."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Карыстанне: /%s <мянушка|JID> [прычына], забараняе JID-у казанне для гэтай "
+"групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна не "
+"ўтрымлівае знака \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, ён "
+"таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
 
-#: ../src/groupchat_control.py:1269
+#: ../src/groupchat_control.py:1663
 #, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1669
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай групавой размове, з пазначанай прычынай запрашэння."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную "
+"прычыну."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1675
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Карыстанне: /%s <пакой>@<сервер>[/мянушка], увайсці ў пакой room@server з вызначанай мянушкай."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай "
+"групавой размове, з пазначанай прычынай запрашэння."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1679
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не падтрымліваюцца."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Карыстанне: /%s <пакой>@<сервер>[/мянушка], увайсці ў пакой room@server з "
+"вызначанай мянушкай."
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1683
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй асобы). (напр., /%s рагоча як конь.)"
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай "
+"мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не "
+"падтрымліваюцца."
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1692
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Карыстанне: /%s <мянушка> [паведамленне], адкрывае вакно прыватнай размовы і адпраўляе паведамленне чалавеку."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Карыстанне: /%s <мянушка> [паведамленне], адкрывае вакно прыватнай размовы і "
+"адпраўляе паведамленне чалавеку."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
+msgstr ""
+"Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Карыстанне: /%s, хавае кнопкі групавой размовы."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Карыстанне: /%s [тэма], паказвае ці змяняе тэму групавой размовы."
 
-#: ../src/groupchat_control.py:1305
-#, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых загадаў."
-
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1708
 #, python-format
-msgid "No help info for /%s"
-msgstr "Даведка па /%s адсутнічае"
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых "
+"загадаў."
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1361
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1839
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1365
-#: ../src/roster_window.py:4036
-msgid "Do _not ask me again"
-msgstr "_Больш не пытацца"
-
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/groupchat_control.py:1435
-msgid "Bookmark already set"
-msgstr "Закладка ўжо ўсталяваная"
-
-#: ../src/groupchat_control.py:1436
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1445
-msgid "Bookmark has been added successfully"
-msgstr "Закладка паспяхова дададзеная"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1446
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага вакна."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:1575
-#: ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Знойдзеная памылка праграмнага коду"
 
-#: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Магчыма, гэтая памылка не крытычная, але пра яе варта паведаміць распрацоўнікам."
+#: ../src/gtkexcepthook.py:47
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Магчыма, гэтая памылка не крытычная, але пра яе варта паведаміць "
+"распрацоўнікам."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Паведаміць пра памылку"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Падрабязнасці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:334
+#: ../src/gtkgui_helpers.py:396
 #, 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:649
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не з'яўляецца прадвызначанай Jabber-праграмай"
 
-#: ../src/gtkgui_helpers.py:650
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ці Вы хочаце зрабіць Gajim прадвызначанай Jabber-праграмай?"
 
-#: ../src/gtkgui_helpers.py:651
+#: ../src/gtkgui_helpers.py:735
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-праграмай"
+msgstr ""
+"Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-"
+"праграмай"
 
-#: ../src/gtkgui_helpers.py:750
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/gtkgui_helpers.py:751
+#: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Немагчыма захаваць малюнак у фармаце %(type)s. Захаваць як %(new_filename)s?"
+msgstr ""
+"Немагчыма захаваць малюнак у фармаце %(type)s. Захаваць як %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:760
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Людзі"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Мянушка"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/history_manager.py:186
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Вы сапраўды хочаце ачысціць базу дадзеных? (Увага: закрыйце Gajim перад працягам)"
+#: ../src/history_manager.py:224
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Вы сапраўды хочаце ачысціць базу дадзеных? (Увага: закрыйце Gajim перад "
+"працягам)"
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Звычайна памер базы дадзеных не змяншаецца, але вызваленае месца можа быць скарыстаным для пазнейшых размоў. Калі Вы хочаце зменшыць памер базы дадзеных, пстрыкніце Так, інакш Не.\n"
+"Звычайна памер базы дадзеных не змяншаецца, але вызваленае месца можа быць "
+"скарыстаным для пазнейшых размоў. Калі Вы хочаце зменшыць памер базы "
+"дадзеных, пстрыкніце Так, інакш Не.\n"
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Экспартаванне журналаў..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 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:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал размоў %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s цяпер %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Немагчыма загрузіць малюнак"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Размовы"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Групавыя размовы"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Прыватныя размовы"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Паведамленні"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новае асобнае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новае прыватнае паведамленне ў групавой размове %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Новае паведамленне ад %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Агульная"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:107
-#: ../src/profile_window.py:210
-#: ../src/profile_window.py:219
-msgid "Click to set your avatar"
-msgstr "Пстрыкніце, каб вызначыць свой аватар"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Месца файла"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Такой групавой размовы няма."
 
 #. keep identation
-#: ../src/profile_window.py:137
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Атрыманыя звесткі"
 
-#: ../src/profile_window.py:314
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
-msgstr "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
+msgstr ""
+"Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Адпраўленне профіля..."
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Звесткі НЕ абноўленыя"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: ../src/profile_window.py:349
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце абнавіць пазней."
+#: ../src/profile_window.py:358
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
+"абнавіць пазней."
 
-#: ../src/roster_window.py:171
-#: ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:344
-#: ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Назіральнікі"
-
-#: ../src/roster_window.py:692
-#: ../src/roster_window.py:3201
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Адпраўленая аўтарызацыя"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "выкарыстоўвае рахунак %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "рахунку %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Адпраўлены запыт на падпіску"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "выкарыстоўвае рахунак %s"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Аўтарызацыя забраная"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "рахунка %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Кіраванне закладкамі..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
+"(магчыма, зменная асяроддзя выстаўленая няправільна)"
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "для рахунка %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Кіраўнік журналаў"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:1068
-msgid "_Join New Group Chat"
-msgstr "_Удзельнічаць у групавой размове"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
+"размоў. Вы сапраўды хочаце стаць нябачным?"
+
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1398
-#: ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
+"журналаў размоў."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:1403
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
+#: ../src/roster_window.py:2526
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:1411
-#, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports:%s"
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:1517
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:1782
-#: ../src/roster_window.py:2043
-msgid "_New group chat"
-msgstr "_Новая групавая размова"
+#: ../src/roster_window.py:3128
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
+
+#: ../src/roster_window.py:3132
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Выдаліўшы гэтага чалавека з Вашага кантактнага ліста, Вы такім чынам таксама "
+"прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1913
-msgid "I would like to add you to my roster"
-msgstr "Я хачу дадаць Вас у мой кантактны ліст"
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:2088
-#: ../src/roster_window.py:2135
-msgid "Send Group M_essage"
-msgstr "Ад_правіць групавое паведамленне"
+#: ../src/roster_window.py:3141
+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:2114
-msgid "Re_name"
-msgstr "_Змяніць імя"
+#: ../src/roster_window.py:3144
+msgid "I want this contact to know my status after removal"
+msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
-#: ../src/roster_window.py:2141
-msgid "To all users"
-msgstr "Усім карыстальнікам"
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3148
+msgid "Contacts will be removed from your roster"
+msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:2144
-msgid "To all online users"
-msgstr "Усім актыўным карыстальнікам"
+#: ../src/roster_window.py:3152
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Выдаліўшы гэтых людзей:%s\n"
+"з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
+"аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:2180
-msgid "_Log on"
-msgstr "_Увайсці"
+#: ../src/roster_window.py:3191
+msgid "No account available"
+msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "_Сысці"
+#: ../src/roster_window.py:3192
+msgid "You must create an account before you can chat with other contacts."
+msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:2312
-#: ../src/roster_window.py:2383
-msgid "_Change Status Message"
-msgstr "З_мяніць паведамленне аб стане"
+#: ../src/roster_window.py:3708
+msgid "Metacontacts storage not supported by your server"
+msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:2455
-msgid "Authorization has been sent"
-msgstr "Адпраўленая аўтарызацыя"
+#: ../src/roster_window.py:3710
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
+"наступных сеансаў."
+
+#: ../src/roster_window.py:3784
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:3786
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Мета-кантакты дазваляюць згрупаваць некалькі кантактаў у адным элеменце "
+"кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
+"Jabber альбо некалькі транспартных рахункаў."
+
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Няправільны файл"
+
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
+msgid "Do you want to send this file to %s:"
+msgid_plural "Do you want to send these files to %s:"
+msgstr[0] "%s хоча адправіць Вам файл:"
+msgstr[1] "%s хоча адправіць Вам файл:"
+msgstr[2] "%s хоча адправіць Вам файл:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
+msgid "using account %s"
+msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:2476
-msgid "Subscription request has been sent"
-msgstr "Адпраўлены запыт на падпіску"
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "рахунку %s"
 
-#: ../src/roster_window.py:2477
+#. disco
+#: ../src/roster_window.py:4679
 #, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
+msgid "using %s account"
+msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:2489
-msgid "Authorization has been removed"
-msgstr "Аўтарызацыя забраная"
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Кіраванне закладкамі..."
 
-#: ../src/roster_window.py:2490
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
+msgid "of account %s"
+msgstr "рахунка %s"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Contact \"%s\" will be removed from your roster"
-msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
+msgid "for account %s"
+msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:2684
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Выдаліўшы гэтага чалавека з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:2689
-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:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:2692
-msgid "I want this contact to know my status after removal"
-msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
 
-#. several contact to remove at the same time
-#: ../src/roster_window.py:2696
-msgid "Contacts will be removed from your roster"
-msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Актыўны"
 
-#: ../src/roster_window.py:2700
-#, python-format
-msgid ""
-"By removing these contacts:%s\n"
-"you also remove authorization resulting in them always seeing you as offline."
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Праглядзець сервісы..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
 msgstr ""
-"Выдаліўшы гэтых людзей:%s\n"
-"з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:2732
-msgid "Gnomekeyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца (магчыма, зменная асяроддзя выстаўленая няправільна)"
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Ад_правіць групавое паведамленне"
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2760
-#: ../src/common/connection.py:596
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:2777
-msgid "Passphrase Required"
-msgstr "Патрэбны пароль"
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Усім актыўным карыстальнікам"
 
-#: ../src/roster_window.py:2778
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Вызначце пароль GPG для рахунка %s."
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 
-#: ../src/roster_window.py:2783
-msgid "Save passphrase"
-msgstr "Захоўваць пароль"
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2791
-msgid "Wrong Passphrase"
-msgstr "Няправільны пароль"
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "Ад_правіць асобнае паведамленне"
 
-#: ../src/roster_window.py:2792
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Транспарты"
 
-#: ../src/roster_window.py:2849
-#: ../src/roster_window.py:2909
-msgid "You are participating in one or more group chats"
-msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Паказаць _транспарты"
 
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2910
-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:5788
+msgid "_Maximize"
+msgstr ""
 
-#: ../src/roster_window.py:2867
-msgid "No account available"
-msgstr "Рахункаў няма"
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:2868
-msgid "You must create an account before you can chat with other contacts."
-msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Новая групавая размова"
 
-#: ../src/roster_window.py:2966
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" выконвае %(artist)s"
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Кіраўнік журналаў"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:3395
-#: ../src/roster_window.py:3402
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем журналаў размоў."
+#: ../src/roster_window.py:6207
+msgid "Change Status Message..."
+msgstr "Змяніць паведамленне стану..."
 
-#: ../src/roster_window.py:3986
-msgid "Metacontacts storage not supported by your server"
-msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
 
-#: ../src/roster_window.py:3988
-msgid "Your server does not support storing metacontacts information. So those information will not be save on next reconnection."
-msgstr "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для наступных сеансаў."
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
 
-#: ../src/roster_window.py:4030
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
 
-#: ../src/roster_window.py:4032
-msgid "Metacontacts are a way to regroup several contacts in one line. Generally it is used when the same person has several Jabber accounts or transport accounts."
-msgstr "Мета-кантакты дазваляюць згрупаваць некалькі кантактаў у адным элеменце кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў Jabber альбо некалькі транспартных рахункаў."
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
 
-#: ../src/roster_window.py:4199
+#: ../src/session.py:238
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Перанесці %s у групу %s"
+msgid "Subject: %s"
+msgstr "Тэма: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
 
-#: ../src/roster_window.py:4206
+#: ../src/session.py:400
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Зрабіць %s і %s мета-кантактамі"
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
 
-#: ../src/roster_window.py:4393
-msgid "Change Status Message..."
-msgstr "Змяніць паведамленне стану..."
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
 
-#: ../src/systray.py:144
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Змяніць паведамленне стану..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Рэсурс: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Апошняе паведамленне: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " ад %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Злучэнне"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Чалавек адлучыўся"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Падпіска: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Пакой:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Актывізаваны"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Тып:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Сцягнуць"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Загрузіць"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Тып: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Не пачатая"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Спыненая"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Скончаная"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Прыпыненая"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Марнаванне часу"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Перадача"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5228,1312 +9530,479 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Адносіны: "
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Праграмы</b>"
 
-#: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:319
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:321
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
 #. None
-#: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+#: ../src/vcard.py:325
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, і ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " рэсурс з прыярытэтам "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "стварэнне базы журналаў"
-
-#: ../src/common/check_paths.py:89
-#: ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is a file but it should be a directory"
-msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
-
-#: ../src/common/check_paths.py:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim сканчвае работу"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is a directory but should be a file"
-msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "стварэнне дырэкторыі %s"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Змяніць звесткі аб стане"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Змяніць стан"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Выставіць тып прысутнасці і апісанне"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Вольны для размовы"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "У сетцы"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Пашыраны рэжым адсутнасці"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Не турбаваць"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Адлучаны - па-за сеткай"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Апісанне прысутнасці:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Стан змяніўся."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s на %(room_jid)s"
-
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Вы не ўвайшлі ў пакой групавой размовы."
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Сысці з групавых размоў"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Выберыце групавыя размовы, з якіх Вы хочаце сысці"
-
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Групавыя размовы"
-
-#: ../src/common/commands.py:230
-msgid "You leaved the following groupchats:"
-msgstr "Вы сышлі з наступных групавых размоў:"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Паказваць нагадванні праз DBus і Notification-Daemon"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Праз колькі хвілінаў змяняць стан на сышоўшы."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Сышоў як вынік марнавання часу"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Праз колькі хвілінаў змяняць стан на недаступны."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Недаступны ў выніку марнавання часу"
-
-#: ../src/common/config.py:83
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Дазволіць мясцовыя паведамленні"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Мова правапісу"
-
-#: ../src/common/config.py:92
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'always' - паказваць час кожнага паведамлення.\n"
-"'sometimes' - паказваць час кожныя print_ichat_every_foo_minutes хвілінаў.\n"
-"'never' - не паказваць час."
-
-#: ../src/common/config.py:93
-msgid "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is 'sometimes'."
-msgstr "Паказваць час у вокнах размовы прыблізна. Значэнне прыблізнасці ад 1 да 4, альбо 0, каб адключыць прыблізнасць. 1 паказвае самы дакладны час, 4 паказвае самы прыблізны. Працуе, калі опцыя print_time мае значэнне 'sometimes'."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Лічыць спалучэнні * / _  мажлівымі знакамі фарматавання."
-
-#: ../src/common/config.py:97
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не выдаляецца."
-
-#: ../src/common/config.py:100
-msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
-msgstr "Ужыць рэструктураваную мову тэкставай разметкі для адпраўлення HTML, а таксама фарматаванне ASCII, калі ўключаная адпаведная опцыя. Глядзіце сінтаксіс на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (калі Вы хочаце ўжыць гэтую магчымасць, усталюйце docutils)"
-
-#: ../src/common/config.py:109
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
-
-#: ../src/common/config.py:110
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Знак пасля вызначанай мянушкі, калі яе згадваюць у групавой размове."
-
-#: ../src/common/config.py:133
-msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr "З дапамогай гэтай опцыі Вы можаце змяніць фармат часавых мецінаў, якія паказваюцца ў вокнах размовы. Напр., \"[%H:%M] \" азначае, што трэба паказваць \"[гадзінаў:хвілінаў] \". Глядзіце падрабязную інфармацыю ў дакументацыі для python на функцыю strftime: http://docs.python.org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Дадаць * і [n] у назву галоўнага вакна?"
-
-#: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Колькі хвілінаў апошняй размовы паказваць у новых размовах."
-
-#: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок (стандартныя паводзіны Mirabilis ICQ)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', што значыць выкарыстанне Вікі-Слоўніка."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-remote."
-
-#: ../src/common/config.py:154
-msgid "If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection."
-msgstr "Калі true, чакаць сігналаў D-Bus ад NetworkManager і змяняць стан рахункаў (для якіх опцыя listen_to_network_manager не выстаўленая ў False і якія сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
-
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, composing_only, disabled."
-
-#: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, composing_only, disabled."
-
-#: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Калі трэба паказваць час не для кожнага паведамлення (print_time==sometimes), паказваць яго кожныя x хвілінаў."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Пытацца пацверджання закрыцця групавой размовы."
-
-#: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Заўсёды пытацца пацверджання закрыцця групавых размоў з гэтага спіса падзеленых прагаламі назваў групавых размоў."
-
-#: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Ніколі не пытацца пацверджання закрыцця групавых размоў з гэтага спіса падзеленых прагаламі назваў групавых размоў."
-
-#: ../src/common/config.py:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / перанакіравання портаў."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Паказваць картку, калі актыўная толькі адна размова?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Паказваць межы картак у вокнах размовы?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Паказваць кнопку закрыцця на картцы?"
-
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых размовах."
-
-#: ../src/common/config.py:190
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Калі true, Gajim будзе пры запуску спраўджваць, ці з'яўляецца ён прадвызначанай Jabber-праграмай."
-
-#: ../src/common/config.py:192
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
-
-#: ../src/common/config.py:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Калі true, Gajim паказвае стан у галоўным вакне для кожнага чалавека"
-
-#: ../src/common/config.py:195
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "Калі true, Gajim будзе адпраўляць запыт на атрыманне аватара кожнаму чалавеку, хто не меў усталяванага аватара ў апошні сеанс, ці чый аватар надта стары."
-
-#: ../src/common/config.py:196
-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:197
-msgid "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "магчымыя значэнні: \"none\", \"all\" альбо \"in_and_out\". Калі опцыя выстаўленая ў \"none\", Gajim не будзе паказваць паведамленні аб змене стану суразмоўцаў у вакне размовы. Калі опцыя выстаўленая ў \"all\", Gajim будзе паказваць усе такія паведамленні. Калі опцыя выстаўленая ў \"in_and_out\", Gajim будзе паказваць толькі паведамленні аб сыходзе / ўваходзе суразмоўцы."
-
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr "Фонавы колер для толькі сышоўшых людзей."
-
-#: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Калі true, адноўленыя з папярэдняга сеанса паведамленні будуць мець меншы памер шрыфта."
-
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Не паказваць аватар для транспарта."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
-
-#: ../src/common/config.py:205
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Калі true і калі ўсталяваныя GTK+ і PyGTK версіі, вышэйшай за 2.8, міргаць вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці нягледжаных падзей."
-
-#: ../src/common/config.py:207
-msgid "Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences."
-msgstr "Jabberd1.4 не любіць звесткі sha, калі чалавек заходзіць у абароненую паролем групавую размову. Змяніце значэнне гэтай опцыі на False, каб перастаць адпраўляць звесткі sha у групавыя размовы"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before the changes will take effect."
-msgstr ""
-"Вызначае вакно для новых паведамленняў.\n"
-"'always' - Усе паведамленні адпраўляюцца ў адзінае вакно.\n"
-"'never' - Усе паведамленні адпраўляюцца ў асобныя вокны.\n"
-"'peracct' - Паведамленні ад кожнага рахунка адпраўляюцца ў асобнае вакно.\n"
-"'pertype' - Паведамленні аднаго тыпу (напр., прыватныя і групавыя) адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі пасля перазапуску праграмы."
-
-#: ../src/common/config.py:211
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Калі false, не паказваць аватары ў вакне размовы."
-
-#: ../src/common/config.py:212
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Калі true, клавіша Escape закрывае картку / вакно."
-
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "Схаваць кнопкі групавой размовы."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Схаваць кнопкі прыватнай размовы."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Хавае банер у групавой размове"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Хавае банер у прыватнай размове"
-
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Схаваць спіс удзельнікаў групавой размовы."
-
-#: ../src/common/config.py:218
-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:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Спіс колераў для фарбавання мянушак у групавой размове."
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
-
-#: ../src/common/config.py:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты радок адключае гэтае вакно."
-
-#: ../src/common/config.py:223
-msgid "If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server."
-msgstr "Калі true, Вы зможаце выставіць для рахунка адмоўны прыярытэт. Увага: калі Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў ад Вашага сервера."
-
-#: ../src/common/config.py:224
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка пароляў Gnome Keyring (калі ўсталяваны)."
-
-#: ../src/common/config.py:225
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных людзей і агульную колькасць у радках групаў і рахункаў."
-
-#: ../src/common/config.py:226
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то лічыць усе ўваходныя паведамленні гэтага тыпу"
-
-#: ../src/common/config.py:237
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў опцыях autopriority_*."
-
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Выпраўленне хібы Jabberd2"
-
-#: ../src/common/config.py:270
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
-
-#: ../src/common/config.py:329
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
-
-#: ../src/common/config.py:330
-#: ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr "Мова праверкі правапісу"
-
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr "усе ці падзеленыя прагаламі станы"
-
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' ці 'both'"
-
-#: ../src/common/config.py:341
-#: ../src/common/config.py:343
-#: ../src/common/config.py:344
-#: ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' ці ''"
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Сон"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Хутка буду"
-
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Хутка буду."
-
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Ежа"
-
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Ямо, пакіньце мне паведамленне."
-
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Фільм"
-
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Гляджу фільм."
-
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Працую"
-
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Працую."
-
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Тэлефон"
-
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Я на тэлефоне."
-
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Сышоў"
-
-#: ../src/common/config.py:360
-msgid "I'm out enjoying life."
-msgstr "Я цешуся з жыцця."
-
-#: ../src/common/config.py:364
-msgid "I'm available."
-msgstr "Я даступны."
-
-#: ../src/common/config.py:365
-msgid "I'm free for chat."
-msgstr "Я магу размаўляць."
-
-#: ../src/common/config.py:367
-msgid "I'm not available."
-msgstr "Мяне няма."
-
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Не турбаваць."
-
-#: ../src/common/config.py:369
-#: ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Бывай!"
-
-#: ../src/common/config.py:379
-msgid "Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname."
-msgstr "Прайграць гэты гук, калі прыходзіць групавое паведамленне з адным з слоў, вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне ўтрымлівае Вашую мянушку."
-
-#: ../src/common/config.py:380
-msgid "Sound to play when any MUC message arrives."
-msgstr "Прайграць гук пры атрыманні паведамлення MUC."
-
-#: ../src/common/config.py:389
-#: ../src/common/optparser.py:193
-msgid "green"
-msgstr "зялёны"
-
-#: ../src/common/config.py:393
-#: ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "садавіна"
-
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "чалавек"
-
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "мора"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Немагчыма загрузіць модуль idle"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Няправільны вузел"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "The host you configured as the ft_override_host_to_send advanced option is not valid, so ignored."
-msgstr "Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму ігнаруецца."
-
-#: ../src/common/connection_handlers.py:590
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
-
-#: ../src/common/connection_handlers.py:1540
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Такая мянушка не дазволеная: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1602
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1625
-msgid "Unable to join group chat"
-msgstr "Немагчыма ўвайсці ў групавую размову"
-
-#: ../src/common/connection_handlers.py:1603
-msgid "A password is required to join this group chat."
-msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
-
-#: ../src/common/connection_handlers.py:1606
-msgid "You are banned from this group chat."
-msgstr "Вам забаронена казанне ў гэтай групавой размове."
-
-#: ../src/common/connection_handlers.py:1609
-msgid "Such group chat does not exist."
-msgstr "Такой групавой размовы няма."
-
-#: ../src/common/connection_handlers.py:1612
-msgid "Group chat creation is restricted."
-msgstr "Стварэнне групавых размоў абмежаванае."
-
-#: ../src/common/connection_handlers.py:1615
-msgid "Your registered nickname must be used."
-msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
-
-#: ../src/common/connection_handlers.py:1618
-msgid "You are not in the members list."
-msgstr "Вас няма ў спісе ўдзельнікаў."
-
-#: ../src/common/connection_handlers.py:1626
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
-"Выберыце іншую мянушку:"
-
-#: ../src/common/connection_handlers.py:1676
-msgid "I would like to add you to my roster."
-msgstr "Я хачу дадаць Вас у мой кантактны ліст."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1697
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "цяпер падпісаны на %s"
-
-#: ../src/common/connection_handlers.py:1699
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "запыт адпіскі ад %s"
-
-#: ../src/common/connection_handlers.py:1701
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "цяпер адпісаны ад %s"
-
-#: ../src/common/connection_handlers.py:1871
-#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s не адпавядае стандарту RFC. Ён не будзе дададзены ў кантактны ліст. Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio.org/"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Злучэнне для рахунка \"%s\" згубленае"
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Перадалучыцеся самастойна."
-
-#: ../src/common/connection.py:187
-#: ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Няправільны адказ"
-
-#: ../src/common/connection.py:405
-#: ../src/common/connection.py:440
-#: ../src/common/connection.py:898
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Немагчыма злучыцца з \"%s\""
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Злучаны з серверам %s:%s з %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Праверце злучэнне альбо паспрабуйце пазней"
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Памылка аўтарызацыі з \"%s\""
-
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Праверце звесткі аўтарызацыі."
-
-#: ../src/common/connection.py:495
-msgid "Error while removing privacy list"
-msgstr "Памылка ў часе выдалення спіса прыватнасці"
-
-#: ../src/common/connection.py:496
-#, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Desactivate it and try again."
-msgstr "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:594
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Пароль OpenPGP не вызначаны"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:636
-msgid "invisible"
-msgstr "нябачны"
-
-#: ../src/common/connection.py:637
-msgid "offline"
-msgstr "адключаны"
-
-#: ../src/common/connection.py:638
-#, python-format
-msgid "I'm %s"
-msgstr "Я %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:729
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
-
-#: ../src/common/connection.py:785
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Тэма: %s\n"
-"%s"
-
-#: ../src/common/connection.py:924
-msgid "Not fetched because of invisible status"
-msgstr "Не атрымана з-за нябачнага стану"
-
-#: ../src/common/contacts.py:271
-msgid "Not in roster"
-msgstr "Няма ў спісе"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Файлы падтрымкі python для D-Bus адсутнічаюць на гэтым кампутары"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Немагчыма скарыстаць D-Bus для Gajim"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Залежнасць ад pysqlite2 (aka python-pysqlite2) не выкананая. Выхад..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Сервіс недаступны: Gajim не працуе, альбо remote_control мае значэнне False"
-
-#: ../src/common/exceptions.py:38
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
-
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Шына сеанса недаступная.\n"
-"Чытайце http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "адзін"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "два"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "тры"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "чатыры"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "пяць"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "шэсць"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "сем"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "восем"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "дзевяць"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "дзесяць"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "адзінаццаць"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "дванаццаць"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 гадзінаў"
-
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "пяць хвілінаў на $0"
-
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "дзесяць хвілінаў на $0"
-
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "чвэрць на $0"
-
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "дваццаць хвілінаў на $0"
-
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "дваццаць пяць хвілінаў на $0"
-
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "палова на $0"
-
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "без дваццаці пяці хвілінаў $1"
-
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "без дваццаці хвілінаў $1"
-
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "без чвэрці $1"
-
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "дзесяць хвілінаў на $s"
-
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "без пяці хвілінаў $1"
-
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "%1 гадзінаў"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Ноч"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Світанак"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Раніца"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " рэсурс з прыярытэтам "
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Амаль дзень"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Шыфраванне OpenPGP"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Полудзень"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s не распаўсюджвае ключ OpenPGP і не мае прызначанага ключа"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Абед"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Такога загаду няма: /%s (калі Вы хочаце адправіць яго, устаўце перад "
+#~ "тэкстам \"/say\")"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Вечар"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
+#~ "асобы). (напр., /%s рагоча як конь.)"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Позні вечар"
+#~ msgid "Encryption enabled"
+#~ msgstr "Шыфраванне дзейнічае"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Пачатак тыдня"
+#~ msgid "Encryption disabled"
+#~ msgstr "Шыфраванне адключанае"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Сярэдзіна тыдня"
+#~ msgid "_Retype Password:"
+#~ msgstr "Паўта_рыце пароль:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Канец тыдня"
+#~ msgid "_Use proxy"
+#~ msgstr "С_карыстаць проксі"
 
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Выходныя!"
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Калі гэтая опцыя ўключаная, усе мясцовыя кантакты з Bonjour-кліентам "
+#~ "(напр., iChat, Trillian, Gaim) будуць паказвацца ў галоўным вакне. Для "
+#~ "гэтага Вам не патрэбнае злучэнне.\n"
+#~ "Гэтая мажлівасць будзе працаваць, калі ўсталяваны python-avahi і працуе "
+#~ "сервіс avahi-daemon."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Калі ў Вас некалькі рахункаў, гэтая опцыя прымушае Gajim паказваць усіх "
+#~ "людзей з розных рахункаў у адзіным спісе"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Уключыць мясцовыя паведамленні"
+
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
+
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Рамэа і Джульета</small>"
+
+#~ msgid "Old stories"
+#~ msgstr "Старыя казкі"
+
+#~ msgid "Soliloquy"
+#~ msgstr "Маналог"
+
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Пстрыкніце, каб праглядзець былыя размовы з гэтым чалавекам"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Кампактны выгляд    Alt+К"
+
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Пстрыкніце, каб праглядзець былую размову ў гэтым пакоі"
+
+#~ msgid "Build custom query"
+#~ msgstr "Стварыць адмысловы запыт"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Стварэнне запыту..."
+
+#~ msgid "Accept"
+#~ msgstr "Прыняць"
+
+#~ msgid "Invitation Received"
+#~ msgstr "Атрыманае запрашэнне"
+
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Фармат радка</b>"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Інтэрфэйс</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Таксама вядома як \"стыль iChat\""
+
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Напрыклад, калі Вы ўключылі паведамленне стану для сышоўшага стану, Gajim "
+#~ "больш не будзе ў Вас пытацца пацверджання гэтага паведамлення"
+
+#~ msgid "Chat"
+#~ msgstr "Размова"
+
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Вызначае адпраўнік\n"
+#~ "Размоўнае паведамленне\n"
+#~ "Асобнае паведамленне"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "_Кожныя 5 хвілінаў"
+
+#~ msgid "Events"
+#~ msgstr "Падзеі"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr "Gajim аўтаматычна пакажа новыя падзеі ў адпаведным выплыўным вакне"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim будзе паведамляць Вам аб новых падзеях у выплыўным вакне ў правым "
+#~ "верхнім куце экрана"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim будзе паведамляць Вам аб увайшоўшых людзях у выплыўным вакне ў "
+#~ "правым верхнім куце экрана"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim толькі зменіць значку чалавека, які стаў прычынай новай падзеі"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Няправільны знак у імені карыстальніка."
+#~ 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 ""
+#~ "Калі гэтая опцыя ўключаная, Gajim запомніць пазіцыю галоўнага і іншых "
+#~ "вокнаў і іх памеры"
 
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Патрэбны адрас сервера."
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Няправільны знак у назве вузла."
-
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Няправільны знак у назве рэсурса."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s ГіБ"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s ГБ"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Ніколі\n"
+#~ "Заўсёды\n"
+#~ "Па рахунках\n"
+#~ "Па тыпе"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s МіБ"
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Адпраўляць _нагадванні стану размовы:"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s МБ"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s кiБ"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s кБ"
+#~ msgid "Print time:"
+#~ msgstr "Паказваць час:"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s Б"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Захоўваць _пазіцыю і памеры галоўнага і размоўных вокнаў"
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Заняты"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Выстаўляць паведамленне стану з улікам _гранай музыкі"
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Заняты"
+#~ msgid "Show only in _roster"
+#~ msgstr "Паказваць толькі ў _галоўным вакне"
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "М_яне няма"
+#~ msgid "The auto away status message"
+#~ msgstr "Паведамленне аб аўтаматычным сыходзе"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Магу размаўляць"
+#~ msgid "The auto not available status message"
+#~ msgstr "Паведамленне аб аўтаматычнай недаступнасці"
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Магу размаўляць"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Лічыць усе ўваходныя паведамленні:"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Тут"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Значка панэлі паведамленняў"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Магчымыя наступныя варыянты нагадвання аб здзяйсненні новых падзей "
+#~ "(паведамленне, запыт на перадачу файла і г.д.). Зважайце, што атрыманне "
+#~ "новага паведамлення фіксуецца толькі тады, калі Вы атрымліваеце "
+#~ "паведамленне ад чалавека, з якім на той момант яшчэ не вялася размова"
+
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Працуе з Rhythmbox і Muine. Для іншых праграмаў глядзіце старонку http://"
+#~ "trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Адмысловыя настаўленні нагадванняў..."
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Тут"
+#~ msgid "_Font:"
+#~ msgstr "_Шрыфт:"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Злучэнне"
+#~ msgid "_Never"
+#~ msgstr "_Ніколі"
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "Н_е тут"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Паведамляць мне пра гэта"
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Адключаны"
+#~ msgid "_Player:"
+#~ msgstr "_Прайгравальнік:"
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Адключаны"
+#~ msgid "_Pop it up"
+#~ msgstr "_Вынырваць"
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "_Нябачны"
+#~ msgid "_URL:"
+#~ msgstr "_Спасылка:"
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "?чалавек у стане:Невядомы"
+#~ msgid "Address"
+#~ msgstr "Адрас"
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "?чалавек у стане:Ёсць памылкі"
+#~ msgid "City:"
+#~ msgstr "Горад:"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "?Ужо ёсць падпіскі:Няма"
+#~ msgid "Company:"
+#~ msgstr "Кампанія:"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Да"
+#~ msgid "Country:"
+#~ msgstr "Краіна:"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Абодва"
+#~ msgid "Given:"
+#~ msgstr "Дадзенае імя:"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "?Запыт (на падпіску):Няма"
+#~ msgid "Middle:"
+#~ msgstr "Сярэдняе:"
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Падпісацца"
+#~ msgid "Position:"
+#~ msgstr "Пазіцыя:"
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "?Роля чалавека:Няма"
+#~ msgid "Prefix:"
+#~ msgstr "Прэфікс:"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Мадэратары"
+#~ msgid "Role:"
+#~ msgstr "Роля:"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Мадэратар"
+#~ msgid "State:"
+#~ msgstr "Штат:"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Удзельнікі"
+#~ msgid "Suffix:"
+#~ msgstr "Суфікс:"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Удзельнік"
+#~ msgid "_Remove from Roster"
+#~ msgstr "Вы_даліць з кантактнага ліста"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Наведвальнікі"
+#~ msgid "A_ccounts"
+#~ msgstr "Р_ахункі"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Наведвальнік"
+#~ msgid "_Filter:"
+#~ msgstr "_Фільтар:"
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
+#~ msgid "Ask:"
+#~ msgstr "Запыт:"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Уладальнік"
+#~ msgid "Client:"
+#~ msgstr "Праграма:"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Адміністратар"
+#~ msgid "OS:"
+#~ msgstr "Аперацыйная сістэма:"
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Удзельнік"
+#~ msgid "Subscription:"
+#~ msgstr "Падпіска:"
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "сочыць за размовай"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Калі гэта не мова, для якой трэба паказваць няправільна напісаныя словы, "
+#~ "тады вызначце зменную $LANG адпаведным чынам. Напр., для беларускай мовы "
+#~ "змясціце загад export LANG=be_BY.UTF-8 у файле ~/.bash_profile, альбо "
+#~ "глабальна ў /etc/profile.\n"
+#~ "\n"
+#~ "Фарбаванне няправільна напісаных слоў не працуе"
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "заняты чымсьці іншым"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Кожныя %s _хвілінаў"
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "піша паведамленне..."
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Вы павінны ўвесці пароль для новага рахунка."
 
-#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "перастаў пісаць"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Вы заўсёды будзеце бачыць гэтага чалавека адключаным."
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "закрыў вакно / картку размовы"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s цяпер %s (%s)"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d нечытанае паведамленне"
-msgstr[1] "%d нечытаныя паведамленні"
-msgstr[2] "%d нечытаных паведамленняў"
+#~ msgid "%s is now %s"
+#~ msgstr "%s цяпер %s"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d нечытанае асобнае паведамленне"
-msgstr[1] "%d нечытаныя асобныя паведамленні"
-msgstr[2] "%d нечытаных асобных паведамленняў"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Ад: %(from_address)s"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d нечытанае групавое паведамленне"
-msgstr[1] "%d нечытаныя групавыя паведамленні"
-msgstr[2] "%d нечытаных групавых паведамленняў"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Падтрымка Network Manager адсутнічае"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d нечытанае прыватнае паведамленне"
-msgstr[1] "%d нечытаныя прыватныя паведамленні"
-msgstr[2] "%d нечытаных прыватных паведамленняў"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Падтрымка працоўных сеансаў адсутнічае (няма модуля gnome.ui)"
 
-#: ../src/common/helpers.py:909
-#: ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Карыстанне: %s %s %s \n"
+#~ "\t %s"
 
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "памылка: немагчыма прачытаць %s"
+#~ msgid "Private Chat"
+#~ msgstr "Прыватная размова"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "Group Chat"
+#~ msgstr "Групавая размова"
 
-#: ../src/common/optparser.py:188
-#: ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "cyan"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s не з'яўляецца карэктным JID"
 
-#: ../src/common/optparser.py:306
-msgid "migrating logs database to indices"
-msgstr "перанос базы журналаў у індэкс"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Рахунак Gajim %s"
+#~ msgid "_New group chat"
+#~ msgstr "_Новая групавая размова"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Немагчыма злучыцца з вузлом: некарэктны адказ сервера."
+#~ msgid "_Log on"
+#~ msgstr "_Увайсці"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Немагчыма ўсталяваць злучэнне з вузлом"
+#~ msgid "Log _off"
+#~ msgstr "_Сысці"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
+#~ msgid "Save passphrase"
+#~ msgstr "Захоўваць пароль"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Перанесці %s у групу %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Памылка Avahi"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Схаваць кнопкі прыватнай размовы."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Мясцовыя паведамленні могуць не працаваць."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Злучаны з серверам %s:%s з %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Праверце, ці ўсталяваны Avahi."
+#~ msgid "invisible"
+#~ msgstr "нябачны"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Немагчыма стартаваць мясцовы сервіс"
+#~ msgid "offline"
+#~ msgstr "адключаны"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Немагчыма злучыцца праз порт %d."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d нечытанае асобнае паведамленне"
+#~ msgstr[1] "%d нечытаныя асобныя паведамленні"
+#~ msgstr[2] "%d нечытаных асобных паведамленняў"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Праверце, ці працуе avahi-daemon."
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d нечытанае групавое паведамленне"
+#~ msgstr[1] "%d нечытаныя групавыя паведамленні"
+#~ msgstr[2] "%d нечытаных групавых паведамленняў"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Немагчыма змяніць стан рахунка \"%s\""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d нечытанае прыватнае паведамленне"
+#~ msgstr[1] "%d нечытаныя прыватныя паведамленні"
+#~ msgstr[2] "%d нечытаных прыватных паведамленняў"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць паведамленне."
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Гэтае паведамленне зашыфраванае]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr "Немагчыма злучыцца з вузлом: некарэктны адказ сервера."
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Памылка дадання сервіса. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Немагчыма ўсталяваць злучэнне з вузлом"
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Пасля мянушкі:"
+
 #~ msgid "B_efore nickname:"
 #~ msgstr "П_ерад мянушкай:"
+
 #~ msgid "_After time:"
 #~ msgstr "_Праз пэўны час:"
+
 #~ msgid "_Before time:"
 #~ msgstr "_За пэўны час да:"
-#~ msgid "_Publish"
-#~ msgstr "_Абнавіць"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Атрымаць"
+
 #~ msgid "Information published"
 #~ msgstr "Звесткі абноўлены"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Вы не можаце атрымаць звесткі аб сабе, не злучыўшыся з сэрвэрам."
-
diff --git a/po/be@latin.po b/po/be@latin.po
index 1df187bdd..36c604ed2 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -4,15 +4,11 @@
 # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006-2007.
 # Based on cyrillic version.
 #
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:236 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:243 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-21 13:20+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-03-10 02:03+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
@@ -35,44 +31,53 @@ msgid "Jabber IM Client"
 msgstr "Klijent kamunikacyi dla Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Dašli _asobnaje aviedamleńnie..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Šukaj servisy..."
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Discover Services"
+msgstr "_Šukaj servisy"
 
-#: ../data/glade/account_context_menu.glade.h:4 ../src/disco.py:1145
+#: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Vykanaj zahad..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Pakoj"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Madyfikuj kont"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Madyfikuj kont..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -85,54 +90,80 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Pstykni, kab pahladzieć zdolnaści serveraŭ Jabber (naprykład, šluzy MSN, ICQ)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Dałučysia pa nacisku knopki \"Skonč\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Stvareńnie kontu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 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:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:7
-msgid "Pass_word:"
-msgstr "_Parol:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Kiruj..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Zachavaj _parol"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Zdolnaści serveraŭ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Nastaŭ profil paśla złučeńnia"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Skarystaj admysłovy host/port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -140,67 +171,64 @@ msgstr ""
 "Ty musiš mieć kont, kab dałučycca da sietki\n"
 "Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Vaš JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Dadatkovyja"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Skonč"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Nazva hosta: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Parol:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "Paŭta_ry parol:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "S_karystaj proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:31
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Imia karystalnika:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Roznaje</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Asabistyja źviestki</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Kont"
 
@@ -209,19 +237,28 @@ msgid "Account Modification"
 msgstr "Madyfikacyja kontu"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Śpis administrataraŭ"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 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:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Zlučajsia pry starcie Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Ź_miani parol"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -233,43 +270,61 @@ msgstr ""
 "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:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Abiary _kluč..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klikni, kab źmianić parol dla kontu"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Złučeńnie"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Źmiani asabistyja źviestki..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:458
-#: ../src/notify.py:480 ../src/notify.py:492 ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:347 ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436 ../src/roster_window.py:2115
-#: ../src/roster_window.py:2157 ../src/common/contacts.py:284
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Ahulnaja"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nazva hosta: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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."
@@ -277,7 +332,8 @@ 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:19
+#: ../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"
@@ -285,7 +341,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:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -294,7 +350,8 @@ 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:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -303,7 +360,8 @@ 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:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -313,46 +371,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:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Kiruj..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1616
-#: ../src/config.py:3294
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Kluč nie abrany"
 
 #. None means no proxy profile selected
-#. GPG Key
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1196
-#: ../src/config.py:1201 ../src/config.py:1385 ../src/config.py:1606
-#: ../src/config.py:1615 ../src/config.py:1675 ../src/config.py:1749
-#: ../src/config.py:3284 ../src/config.py:3293 ../src/dialogs.py:281
-#: ../src/dialogs.py:283 ../src/roster_window.py:1540
-#: ../src/roster_window.py:1547 ../src/roster_window.py:1554
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Nijaki"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Pryjary_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -362,19 +423,22 @@ 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:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 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:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "_Krynica:"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -387,92 +451,158 @@ 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:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Zachavaj _parol (niebiaśpiečna)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "_Synchranizuj status kontu z glabalnym statusam"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Skarystaj admysłovy host/port"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Dastasuj da statusu"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Imia:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../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:6
 msgid "Accounts"
 msgstr "Konty"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Kali ŭklučanaja hetaja opcyja, usie lakalnyja kantakty, jakija karystajucca "
-"prahramaj z zdolnaściami pratakołu Bonjour (naprykład, iChat, Trillian, "
-"Gaim), buduć pakazanyja ŭ śpisie kantaktaŭ. Dla hetaha tabie nia treba navat "
-"złučacca z serveram Jabber.\n"
-"Hetaja zdolnaść budzie pracavać tolki z ustalavanym python-avahi i servisam "
-"avahi-daemon."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-mail:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Ukluč"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ŭ ciabie niekalki kontaŭ, Gajim budzie pakazvać usie kantakty ŭ adzinym "
-"śpisie"
+"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:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "JID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Proźvišča:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Źlej konty ŭ adno"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Uklučy miascovyja paviedamleńni"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "_Źmiani nazvu"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Madyfikuj"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Vydal"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Užyvaj admysłovy port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -567,6 +697,7 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Apisańnie</b>"
 
@@ -591,45 +722,45 @@ msgid "Deletes Message of the Day"
 msgstr "Vydal paviedamleńnie dniu"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Śpisy pryvatnaści"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 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:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Vyznač MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Vyznač paviedamleńnie dniu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Pakažy _kansol XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Aktualizuj MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Aktualizuj paviedamleńnie dniu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administratar"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Śpisy pryvatnaści"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Dašli paviedamleńnie servera"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Dašli asobnaje paviedamleńnie"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " akno/kartka razmovy z hetym kantaktam adčynienaja "
@@ -643,7 +774,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Umovy</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Huki</b>"
 
@@ -660,7 +791,7 @@ msgid "All statuses"
 msgstr "Usie statusy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Adyjšoŭ"
 
@@ -677,7 +808,7 @@ msgid "Have "
 msgstr "Nie razmaŭlaju "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Niabačny"
 
@@ -686,7 +817,7 @@ msgid "Launch a command"
 msgstr "Vykanaj zahad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Niedastupny"
 
@@ -809,6 +940,34 @@ msgstr "Atrymaŭ novy zapis"
 msgid "You have received new entry:"
 msgstr "Atrymaŭ novy zapis:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Kantakty"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Huki</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Źmiani parol"
@@ -838,10 +997,9 @@ msgid "Join _Group Chat"
 msgstr "Dałučysia da _pakoju"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Dadaj u śpis kantaktaŭ"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -861,39 +1019,70 @@ msgid "_Open Link in Browser"
 msgstr "_Adčyni spasyłku ŭ hartačy"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../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/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klikni, kab pahladzieć tekt papiarednich razmoŭ z hetym kantaktam"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kantakty"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Vyšli _fajł"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kampaktny vyhlad    Alt+K"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Dadaj u śpis kantaktaŭ"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:8
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "_Zaprasi"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Naziralniki"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Zapoŭni formu."
@@ -906,6 +1095,24 @@ msgstr "Kanfihuracyja pakoju"
 msgid "Edit Groups"
 msgstr "Źmiani hrupy"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Apisańnie</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Zdolnaści serveraŭ"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
@@ -956,7 +1163,7 @@ msgstr "Hetaje dziejańnie anuluje pieradaču fajła i vydalić jaje ź śpisu."
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Praciahni"
 
@@ -964,7 +1171,7 @@ msgstr "_Praciahni"
 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:188
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Adčyni kataloh z fajłam"
 
@@ -1012,7 +1219,7 @@ msgstr "Kanfihuracyja temy Gajim"
 msgid "Gone"
 msgstr "Vyjšaŭ"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Pasiŭny"
 
@@ -1053,62 +1260,73 @@ msgid "_Background:"
 msgstr "_Fon:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Źmiani _mianušku"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Źmiani _temu"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klikni, kab pahladzieć tekst minułych razmoŭ u hetym pakoji"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Kanfihuruj _pakoj"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Kanfihuruj _pakoj"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Stvary zakładku dla hetaja pakoju"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+#, fuzzy
+msgid "_Destroy Room"
+msgstr "Apisańnie: %s"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Destroy room"
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Kiruj zakładkami"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Minimize on close"
 msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Ma_deratar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Dziejańni haspadara"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administratar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "Za_blakuj"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Vypchni"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Udzielnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Dziejańni haspadara"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Uładalnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Dasłać pryvatnaje paviedamleńnie"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Daj hołas"
 
@@ -1116,22 +1334,19 @@ msgstr "_Daj hołas"
 msgid "Create new post"
 msgstr "Stvary novy zapis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Ad"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Tema"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1145,56 +1360,58 @@ 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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Vydal"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Ekspartuj"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Šukaj u bazie žurnałaŭ"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Stvary admysłovy zapyt"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Žurnał razmoŭ"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Stvaralnik zapytaŭ..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Šukaj"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "Š_ukaj"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Dazvol"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Admoŭ"
+#, fuzzy
+msgid "Search:"
+msgstr "Šukaj"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Atrymanaje zaprašeńnie"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Zachoŭvaj žurnał razmoŭ"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1208
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
@@ -1203,14 +1420,12 @@ 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:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Mianuška:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Parol:"
 
@@ -1219,12 +1434,12 @@ msgid "Recently:"
 msgstr "Niadaŭna:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Pakoj:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1163
-#: ../src/disco.py:1546
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Dałučysia"
 
@@ -1246,18 +1461,37 @@ msgstr ""
 msgid "Manage Bookmarks"
 msgstr "Kiruj zakładkami"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Pakazvaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Zahałovak:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Kanfihuracyja pakoju"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Ułaścivaści</b>"
@@ -1278,11 +1512,13 @@ msgid "Manage Proxy Profiles"
 msgstr "Kiruj profilami proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Name:"
 msgstr "Nazva:"
 
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Parol:"
+
 #: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Typ:"
@@ -1291,25 +1527,59 @@ msgstr "Typ:"
 msgid "Use authentication"
 msgstr "Užyvaj aŭtaryzacyju"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "Šyfravańnie OpenPGP"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Dziejańni"
+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"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:245
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Vyšli"
 
@@ -1325,36 +1595,77 @@ msgstr "<b>Redaktar dadatkovych naładaŭ</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Dziejańni</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Asablivy</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Redahuj praviła</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Farmat radka</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opcyi GMail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Vizualnyja nahadvańni</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Asabistaja kanfihuracyja interfejsu</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Asablivy</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Huki</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opcyi GMail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Śpis pryvatnaści</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Ułaścivaści</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualnyja nahadvańni</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Pašyranyja"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Pašyranyja"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1364,53 +1675,27 @@ msgstr ""
 "Tolki datyčnyja pisańnia\n"
 "Adklučana"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 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:18
-msgid "Also known as iChat style"
-msgstr "Taksama viadomy jak styl iChat"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr ""
-"Zaŭsiody pry starcie praviaraj, ci pryznačany Gajim _zmoŭčanym klijentam "
-"Jabber"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Naprykład, kali ty ŭžo ŭklučyŭ paviedamleńnie statusu dla stany Adyjšoŭ, "
-"tady Gajim bolš nia budzie pytacca paćvierdžańnia hetaha tekstu"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Spytaj paviedamleńnia statusu, kali ja:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Aŭtamatyčna vyznačać pry kožnym starcie Gajim\n"
@@ -1418,72 +1703,59 @@ msgstr ""
 "Zaŭsiody karystacca prahramami, pryznačanymi dla KDE\n"
 "Inšyja"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "Chat"
-msgstr "Razmova"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"Uklučy hetuju opcyju, kali tabie nadakučvaje ci zakidvaje niepatrebnymi "
-"paviedamleńniami chtości, kaho navat niama ŭ śpisie kantaktaŭ. Ale zvažaj, "
-"što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
-"tabie paviedamleńnie"
+"Zaŭsiody pry starcie praviaraj, ci pryznačany Gajim _zmoŭčanym klijentam "
+"Jabber"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "Kanfihuruj koler i šryft interfejsu"
 
-#: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
-
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Standartny zbor _ikon statusu:"
-
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Vyznačaje adpraŭnik\n"
-"Razmova\n"
-"Asobnaje paviedamleńnie"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "_Kožnyja 5 chvilinaŭ"
+msgid "Display _extra email details"
+msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Smajliki:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Padzieji"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Display status _messages of contacts in roster"
+msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
+
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1493,7 +1765,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
 "pakazvać u voknach razmoŭ."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1503,41 +1775,27 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
 "surazmoŭcam."
 
-#: ../data/glade/preferences_window.glade.h:46
-#, fuzzy
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr ""
-"Gajim budzie aŭtamatyčna pakazvać novyja paviedamleńni ŭ adpaviednym aknie"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim budzie nahadvać ab novych padziejach u vypłyŭnym aknie ŭ pravym nižnim "
-"kucie ekranu"
-
 #: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim budzie paviedamlać ab dałučeńni kantaktaŭ da servera ŭ pravym nižnim "
-"kucie ekranu"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 "Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
 "kucie ekranu"
 
 #: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Chavaje knopki ŭ aknie pakoju."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim tolki źmienić ikonu kantakta, jaki ŭčyniŭ novuju padzieju"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
@@ -1549,13 +1807,24 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:53
 msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
+msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1563,105 +1832,150 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
 "kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie zapaminać pazycyju i pamiery "
-"śpisu kantaktaŭ i voknaŭ razmoŭ i adnaŭlać ich pry nastupnym starcie"
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+"śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać admysłovyja ikony dla "
-"kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
-"MSN)"
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+"śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
-"(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+"śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
+#: ../data/glade/preferences_window.glade.h:60
+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:59
-msgid "Ma_nage..."
-msgstr "_Kiruj..."
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Uklučy hetuju opcyju, kali tabie nadakučvaje ci zakidvaje niepatrebnymi "
+"paviedamleńniami chtości, kaho navat niama ŭ śpisie kantaktaŭ. Ale zvažaj, "
+"što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
+"tabie paviedamleńnie"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Nikoli\n"
-"Zaŭsiody\n"
-"Dla kožnaha konta\n"
-"Dla kožnaha typu"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
+"źviestki pra aŭtaraŭ novych listoŭ"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać admysłovyja ikony dla "
+"kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
+"MSN)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "Dla kožnaha _paviedamleńnia"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
+"(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "_Hrupuj vokny:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Vysyłańnie paviedamleńnia ab stanie _razmovy:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Hrupuj vokny:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "_Ahučvaj"
+msgid "Ma_nage..."
+msgstr "_Kiruj..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Nałady"
+#, fuzzy
+msgid "Notifications"
+msgstr "Madyfikacyja kontu"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Pakazvaj čas:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Zachoŭvaj _pazycyju i pamiery śpisu kantaktaŭ i voknaŭ razmovy"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Vystaŭlaj paviedamleńnie statusu jak nazvu hranaj _muzyčnaj kampazycyi"
+msgid "Notify on new _GMail email"
+msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Asabistyja źviestki"
 
 #: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "_Ahučvaj"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Nałady"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Dałučajusia"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Adłučajusia"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1670,139 +1984,148 @@ msgstr ""
 "kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
 "biez afarmleńnia."
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Status"
-msgstr "Status"
-
-#: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "T_ema:"
-
-#: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Adyjšoŭ\""
-
-#: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Niedastupny\""
-
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Traktuj usie ŭvachodnyja paviedamleńni jak:"
-
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Užyvaj _ikony transpartaŭ"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Paradkuj kantakty pa statusie"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Užyvaj _zmoŭčany dla systemy"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Status"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Standartny zbor _ikon statusu:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Mahčymyja nastupnyja varyjanty nahadvańnia ab ździajśnieńni novych padziejaŭ "
-"(ab paviedamleńniach, zapytach na pieradaču fajłaŭ i h.d.). Zvažaj, što "
-"atrymańnie novaha paviedamleńnia adbyvajecca tolki tady, kali ty atrymvaješ "
-"paviedamleńnie ad kantakta, ź jakim jašče na toj momant nia vioŭ razmovy"
+#, fuzzy
+msgid "Style"
+msgstr "Zatrymana"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Kali ŭčyniajecca novaja padzieja"
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/glade/preferences_window.glade.h:88
 msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
-"Pracuje dla Rhythmbox i Muine. Dla inšych prahram hladzicie staronku http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Pašyranaje kiravańnie nahadvańniami..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Hartač:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Užyvaj _ikony transpartaŭ"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Kiraŭnik fajłaŭ:"
+msgid "Use system _default"
+msgstr "Užyvaj _zmoŭčany dla systemy"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Šryft:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kali ŭčyniajecca novaja padzieja"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Padśviatlaj słovy z pamyłkami"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
+msgid "_Browser:"
+msgstr "_Hartač:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "_Uvachodnaje paviedamleńnie:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Smajliki:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Paštovaja prahrama:"
+msgid "_File manager:"
+msgstr "_Kiraŭnik fajłaŭ:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Nikoli"
+msgid "_Highlight misspelled words"
+msgstr "_Padśviatlaj słovy z pamyłkami"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Paviedam mnie pra heta"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Adčyni..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "_Zychodnaje paviedamleńnie:"
+msgid "_Incoming message:"
+msgstr "_Uvachodnaje paviedamleńnie:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Player:"
+msgid "_Log status changes of contacts"
+msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Vynyrni"
+msgid "_Mail client:"
+msgstr "_Paštovaja prahrama:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "_Viarni zvyčajnyja kolery"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Paradkuj kantakty pa statusie"
+msgid "_Open..."
+msgstr "_Adčyni..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "Pa_viedamleńnie statusu:"
+msgid "_Outgoing message:"
+msgstr "_Zychodnaje paviedamleńnie:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_URL:"
+msgid "_Reset to Default Colors"
+msgstr "_Viarni zvyčajnyja kolery"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "Pa_viedamleńnie statusu:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Dałučysia da _pakoju"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Niama ŭ śpisie kantaktaŭ"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "chvilinaŭ"
 
@@ -1838,6 +2161,10 @@ msgstr "usim"
 msgid "Allow"
 msgstr "Dazvol"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Admoŭ"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JID"
@@ -1846,7 +2173,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Paradak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1922
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
@@ -1886,145 +2213,177 @@ msgstr "dasyłać mnie paviedamleńni statusu"
 msgid "to view my status"
 msgstr "bačyć moj status"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Dadaj praviła</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Pra siabie"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adras"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Narodziny:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ../data/glade/vcard_information_window.glade.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:6
-msgid "Birthday:"
-msgstr "Narodziny:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Horad:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Huki</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Klikni, kab vystavić svoj avatar"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Addzieł:"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Firma:"
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "E-mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Krajina:"
-
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
-msgstr "Addzieł:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, 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:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-mail:"
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Proźvišča:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
-msgstr "Dadatkovy adras:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Asablivy</b>"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
-msgstr "Proźvišča:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Chatniaja staronka:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Farmat: HHHH-MM-DD"
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Dadaj praviła</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Imia:"
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Asablivy</b>"
 
 #: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Mianuška:"
+
+#: ../data/glade/profile_window.glade.h:20
 #: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
-msgstr "Chatniaja staronka:"
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefon:"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Druhoje imia:"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Umovy</b>"
 
 #: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Paštovy indeks:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
 #: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Bolš"
+#, 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:31
-msgid "Personal Info"
-msgstr "Asabistyja źviestki"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Huki</b>"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Nałady</b>"
 
 #: ../data/glade/profile_window.glade.h:27
 #: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefon:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Stanovišča:"
+#, 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:34
-msgid "Postal Code:"
-msgstr "Paštovy indeks:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Huki</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Prefiks:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Pra siabie"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Funkcyja:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Štat:"
+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:41
-msgid "Street:"
-msgstr "Vulica:"
-
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Sufiks:"
+msgid "Format: YYYY-MM-DD"
+msgstr "Farmat: HHHH-MM-DD"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Asabistyja źviestki"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Praca"
 
@@ -2040,78 +2399,128 @@ msgstr "Vydal kont _tolki dla Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Vydal"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Spytaj _dazvołu bačyć jahony/jejny status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Dadaj admysłovaje _nahadvańnie"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Pryznač kluč Open_PGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2079
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Źmiani _hrupy"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2214
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Vykanaj zahad..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2037
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Vyšli _asobnaje paviedamleńnie"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Vydal"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Dasyłaje svoj XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Dašli _asobnaje aviedamleńnie..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Vyšli _fajł"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Pačni _razmovu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Dazvol jamu/joj _bačyć moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Za_barani jamu/joj bačyć moj status"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2031 ../src/roster_window.py:2128
-#: ../src/roster_window.py:2235
-msgid "_Remove from Roster"
-msgstr "_Vydal ź śpisu kantaktaŭ"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2223
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Źmiani nazvu kantaktu"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "Źmiani _nazvu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Aŭtaryzacyja"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "dziaviataja"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Konty"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Dadaj kantakt..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "_Dadaj kantakt"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Zdolnaści serveraŭ"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2125,51 +2534,91 @@ msgstr "Častyja pytańni (online)"
 msgid "Help online"
 msgstr "Dapamoha online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Pakažy _transparty"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Pakažy _śpis kantaktaŭ"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Źmiest"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Konty"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Šukaj servisy"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Dziejańni"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1284
-#: ../src/roster_window.py:2206
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Źmiest"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Źmianić"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_Častyja pytańni"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Dapamoha"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Nałady"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Skonč pracu"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Dašli _asobnaje aviedamleńnie..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Vyhlad"
 
+#: ../data/glade/search_window.glade.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
+msgid "Search"
+msgstr "Šukaj"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "_Dadaj kantakt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Źviestki ab kantakcie"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "Š_ukaj"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Pierajdzi"
@@ -2178,10 +2627,6 @@ msgstr "_Pierajdzi"
 msgid "_Address:"
 msgstr "_Adras:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Zarehistrujsia na"
@@ -2259,10 +2704,31 @@ msgstr "Zapyt aŭtaryzacyi"
 msgid "_Deny"
 msgstr "_Admoŭ"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
@@ -2275,57 +2741,73 @@ msgstr "Pakažy _śpis kantaktaŭ"
 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:5
-msgid "Ask:"
-msgstr "Pytaj:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Dziejańni</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Prahrama:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "JID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Krynica:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Nałady</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Apisańnie</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Asablivy</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Kamentary"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Kanfihuruj _pakoj"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kantakt"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "JID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "Aperacyjnaja systema:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Krynica:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Aŭtaryzacyja:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Bolš"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Zachoŭvaj žurnał razmoŭ"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Avatar:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2335,11 +2817,6 @@ msgstr "<b>Trafik Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Uvod XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ukluč"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2358,15 +2835,29 @@ msgstr "_Paviedamleńnie"
 msgid "_Presence"
 msgstr "P_rysutnaść"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Imia:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Dadaj admysłovaje _nahadvańnie"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Proźvišča:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Pryznač kluč Open_PGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Źmiani _hrupy"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "Źmiani _nazvu"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Madyfikuj kont..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2376,246 +2867,407 @@ msgstr "Lakalny JID:"
 msgid "Personal"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Krynica:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Madyfikuj kont"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Užyvaj admysłovy port:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Źviestki ab kantakcie"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Dziejny"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Niadziejny"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Lahičnaja źmiennaja"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Cely lik"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Koler"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nazva nałady"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Vartaść"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Niama)"
 
-#. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Schavany"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Anhielskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Biełaruskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Baŭharskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Breton"
 msgstr "Brytonskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Českaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Niamieckaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Hreckaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Brytanskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Hišpanskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francuzkaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Charvackaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italijskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Narveskaja (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Halandzkaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Narveskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Partuhalskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilskaja partuhalskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Rasiejskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Serbskaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Słavackaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Švedzkaja"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Kitajskaja (Ch)"
 
-#: ../src/chat_control.py:207 ../src/dialogs.py:1576
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Kali heta nia taja mova, dla jakoj treba padśviatlać słovy z pamyłkami, "
-"vystaŭcie źmiennuju $LANG adpaviedna patrebam. naprykład, dla biełaruskaj "
-"movy źmiaścicie zahad export LANG=be_BY.UTF-8 u fajle ~/.bash_profile, albo "
-"hlabalna ŭ /etc/profile.\n"
-"\n"
-"Słovy z pamyłkami nie padśviatlajucca"
-
-#: ../src/chat_control.py:246
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Mova spraŭdžvańnia pravapisu"
 
 #. we are not connected
-#: ../src/chat_control.py:269 ../src/chat_control.py:475
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1034
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Šyfravańnie ŭklučanaje"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Niama ŭ śpisie"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" ŭ vykanańni %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Šyfravańnie adklučanaje"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
 msgstr ""
-"%s nie dasłaŭ svajho kluča OpenPGP, a ty taksama nie pryznačyŭ na jaho kluča"
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Šyfravańnie ŭklučanaje"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Zahady: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad treciaj "
+"asoby). (naprykład, /%s rahoča, jak koń.)"
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Niama daviedki pa /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
-#: ../src/dialogs.py:629 ../src/gajim.py:850 ../src/gajim.py:851
-#: ../src/gajim.py:1196 ../src/roster_window.py:333
-#: ../src/roster_window.py:411 ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508 ../src/roster_window.py:1687
-#: ../src/roster_window.py:1893 ../src/roster_window.py:2478
-#: ../src/roster_window.py:2679 ../src/roster_window.py:3917
-#: ../src/roster_window.py:3919 ../src/common/contacts.py:73
-#: ../src/common/helpers.py:43 ../src/common/helpers.py:255
-msgid "Not in Roster"
-msgstr "Niama ŭ śpisie"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
+
+#: ../src/chat_control.py:1854
+#, 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:1552
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:1553
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2623,29 +3275,2607 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../src/config.py:139 ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s maje ciapier status %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "stvarajecca baza žurnałaŭ"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s jość fajłam, ale musiŭ być kataloh"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim zaviaršaje vykanańnie"
+
+#: ../src/common/check_paths.py:136
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s jość kataloham, ale musiŭ być fajł"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "stvarajecca kataloh %s"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Źmiani infarmacyju statusu"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Źmiani status"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Akreśli typ bačnaści i apisańnie"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Achvotna parazmaŭlaju"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Dałučany"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Adyjšoŭ"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Nie turbavać"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Niabačny - adłučany"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Apisańnie statusu:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Status źmianiŭsia."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Pakiń pakoji"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s z pakoju %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Ty nie dałučyŭsia da pakoju."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Zaznač pakoji, jakija chočaš pakinuć"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Pakoji"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Ty pakinuŭ nastupnyja pakoji:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d niečytanaje paviedamleńnie"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Pakazvaj nahadvańni z dapamohaj DBus i Notification-Daemon"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Adyjšoŭ\"."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Status \"Adyjšoŭ\" jak vynik biaździejnaści prahramy"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr ""
+"Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Niedastupny\"."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Status \"Niedastupny\" jak vynik biaździejnaści prahramy"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Zmoŭčany"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Uklučy lakalnyja paviedamleńni praz Zeroconf"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Mova pravierki pravapisu"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - pakazvaj čas dla kožnaha paviedamleńnia.\n"
+"'sometimes' - pakazvaj čas praz kolkaść chvilinaŭ, akreślenuju ŭ opcyi "
+"print_ichat_every_foo_minutes.\n"
+"'never' - nie pakazvaj času."
+
+#: ../src/common/config.py:121
+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 ""
+"Pakazvaj niedakładny čas. Vartaść niedakładnaści ad 1 da 4 albo 0, kab "
+"adklučyć niedakładnaść. 1 akreślivaje samy dakładny čas, 4 akreślivaje samy "
+"niedakładny. Zadziejničana, kali opcyja print_time maje vartaść 'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
+"ale i znaki * * nia vydalacca."
+
+#: ../src/common/config.py:128
+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žyvaje restrukturavanuju movu tekstavaj raźmietki dla dasyłańnia HTML, a "
+"taksama farmatavańnie ASCII, kali zadziejničana adpaviednaja opcyja. Hladzi "
+"syntaksyčnyja praviły pa adrasie: http://docutils.sourceforge.net/docs/ref/"
+"rst/restructuredtext.html (Kali chočaš karystacca hetaj mahčymaściu, "
+"zainstaluj docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
+"movie inšaha ŭdzielnika pakoju."
+
+#: ../src/common/config.py:161
+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 ""
+"Hetaja opcyja dazvalaje tabie akreślić farmat miecin času ŭ razmovie. "
+"Naprykład, \"[%H:%M] \" akreślaje, što treba pakazvać \"[hadziny:chviliny] "
+"\". Hladzi padrabiaznyja źviestki ŭ dakumentacyi dla Pythonu pa funkcyi "
+"strftime: http://docs.python.org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Kolki chvilinaŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym "
+"aknie."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Dasyłaj paviedamleńnie praz Ctrl+Enter, a Enteram stvaraj novy radok "
+"(zmoŭčanyja pavodziny Mirabilis ICQ)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Kolki radkoŭ zachoŭvać dla Ctrl+KeyUP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Albo specyjalny adrasm jaki ŭtrymlivaje %s, dzie %s jość słovam/vyrazam, "
+"albo radok 'WIKTIONARY', što aznačaje vykarystańnie Wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Kali hetaja opcyja ŭklučanaja, Gajimam možna kiravać praz gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Kali hetaja opcyja maje vartaść True, čakaj syhnałaŭ D-Bus ad NetworkManager "
+"i źmianiaj status kontaŭ (dla jakich opcyja listen_to_network_manager nia "
+"maje vartaści False i jakija synchranizujucca z hlabalnym stanam) zhodna "
+"statusu sietkavaha złučeńnia."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
+"vartaściaŭ: all, composing_only, disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Pakazanyja nahadvańni stanu razmovy ŭ voknach. Musić być adnoj z nastupnych "
+"vartaściaŭ: all, composing_only, disabled."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
+"(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Zaŭsiody pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
+"hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nikoli nie pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
+"hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
+"adrasoŭ/pieranakiravańnia partoŭ."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Standart IEC vyznačaje, što KiB = 1024 bajtaŭ, KB = 1000 bajtaŭ."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Pakazvać padzieł kartak u voknach razmovy?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Pakazvać knopki začynieńnia na kartkach?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
+"pakojach."
+
+#: ../src/common/config.py:219
+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 ""
+"Kali opcyja maje vartaść True, Gajim zaviaršaje vykanańnie pa nacisku knopki "
+"X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
+"nahadvańnia."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Kali opcyja maje vartaść True, Gajim budzie praviarać, ci akreśleny jon jak "
+"zmoŭčany klijent Jabber."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Kali opcyja maje vartaść True, Gajim pakazvaje ikonu na kožnaj kartcy ź "
+"niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža być "
+"animavanaj."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Kali opcyja maje vartaść True, Gajim pakazvaje status kožnaha kantaktu, kali "
+"jon nie pusty, dla kožnaha elementu śpisu kantaktaŭ."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Kali opcyja maje vartaść True, Gajim budzie pytać avatary ŭ kožnaha "
+"kantaktu, jaki nia mieŭ avatara byłym razam, albo kali buferavany avatar "
+"sastareje."
+
+#: ../src/common/config.py:229
+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 ""
+"Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
+"surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
+
+#: ../src/common/config.py:230
+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 ""
+"moža mieć vartaść: \"none\", \"all\" albo \"in_and_out\". Kali opcyja maje "
+"vartaść \"none\", Gajim nia budzie pakazvać paviedamleńni statusu ŭ "
+"pakojach, kali surazmoŭca źmianiaje status. Kali opcyja maje vartaść \"all"
+"\", Gajim budzie pakazvać usie takija paviedamleńni. Kali opcyja maje "
+"vartaść \"in_and_out\", Gajim budzie pakazvać tolki paviedamleńni ab "
+"dałučeńni/adłučeńni surazmoŭcaŭ."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Fonavy koler kantaktaŭ, kali jany tolki adłučylisia."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Kali opcyja maje vartaść True, adnoŭlenyja paviedamleńni buduć pakazvacca "
+"mienšym za zmoŭčany šryftam."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Nie pakazvaj avatara dla transpartu."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
+
+#: ../src/common/config.py:238
+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 ""
+"Kali opcyja maje vartaść True i kali instalavanyja GTK+ i PyGTK versii 2.8 "
+"albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
+"Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
+
+#: ../src/common/config.py:240
+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 nia lubić danych SHA pry sprobie dałučeńnia da pakoju, "
+"abaronienaha parolem. Źmiani vartaść hetaj opcyi na False, kab pierastać "
+"słać takija danyja SHA."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Kiruje aknom, u jakim pakazvajucca novyja paviedamleńni.\n"
+"'always' - Usie paviedamleńni pakazvajucca ŭ adnym aknie.\n"
+"'never' - Usie paviedamleńni pakazvajucca ŭ asobnych voknach.\n"
+"'peracct' - Paviedamleńnia z adnaho kontu pakazvajucca ŭ adnym aknie.\n"
+"'pertype' - Paviedamleńni adnaho typu (naprykład, pryvatnyja albo hrupavyja) "
+"pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
+"ŭruchomić Gajima nanoŭ."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr ""
+"Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+"Kali opcyja maje vartaść True, nacisk klavišy Escape začyniaje kartku/akno."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Chavaje knopki ŭ aknie pakoju."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Chavaje baner u aknie pakoju"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Chavaje baner u aknie pryvatnaj razmovy"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Chavaje śpis naviednikaŭ pakoju."
+
+#: ../src/common/config.py:250
+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 ""
+"U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
+"nia taja asoba, što napisała papiaredniaje paviedamleńnie."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Dašli paviedamleńnie i začyni akno"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr "Śpis koleraŭ dla farbavańnia mianušak u pakojach."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Ctrl-Tab pierachodzić na nastupnuju kartku, kali na dziejnaj niama "
+"niečytanych paviedamleńniaŭ."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
+"radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
+
+#: ../src/common/config.py:256
+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 ""
+"Kali opcyja maje vartaść True, ty zmožaš akreślić admoŭny pryjarytet ŭ aknie "
+"madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
+"nia budzieš atrymvać paviedamleńniaŭ z servera."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
+"Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
+"kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Moža być pustym albo mieć vartaść 'chat' ci 'normal'. Kali vartaść nie "
+"pustaja, traktuj usie ŭvachodnyja paviedamleńni jak paviedamleńni hetaha typu"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
+"akreślivajucca ŭ opcyjach autopriority_*."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Abychod dla Jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
+"adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Mova, dla jakoj treba praviarać pravapis"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "\"all\" albo statusy, padzielenyja prabiełami"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no' albo 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' albo ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Splu"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Chutka viarnusia"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Viarnusia praz paru chvilinaŭ."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Jem"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Hladžu film."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Pracuju"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Ja pracuju."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Ja razmaŭlaju pa telefonie."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Vyjšaŭ"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Vyjšaŭ ciešycca z žyćcia."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Dastupny."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Achvotna parazmaŭlaju."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Chutka viarnusia."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Niedastupny."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Nie turbavać."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Byvaj!"
+
+#: ../src/common/config.py:441
+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 ""
+"Hukm jaki treba hrać, kali paviedamleńnie ŭ pakoji ŭtrymlivaje adno sa "
+"słovaŭ, akreślenych u opcyi muc_highlight_words, albo tvaju mianušku."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "zialony"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "bakaleja"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "čałaviek"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marski"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Niemahčyma adčytać modulu idle"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Niapravilny host"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Źviestki rehistracyi dla transpartu %s nie pryjšli ŭ čas"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Pašyreńnie nie padtrymvajecca"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Mianuška nie dazvolenaja: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Niemahčyma dałučycca da pakoju"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Ty zablakavany ŭ hetym pakoji."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Takoha pakoju niama."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Stvareńnie pakojaŭ abmiežavanaje."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Aŭtaryzacyja anulavanaja"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "padpisany na %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "zapyt adpiski ad %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "ciapier adpisany ad %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s nie adpaviadaje standartu RFC. Jon nia budzie dadany da tvajho śpisu "
+"kantaktaŭ. Vydal jaho z dapamohaj pryłady kiravańnia śpisam kantaktaŭ, "
+"naprykład, http://jru.jabberstudio.org/"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Parol OpenPGP nia vyznačany"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ty dałučyśsia da %s biaz OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Niemahčyma adčytać modulu idle"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Pieradałučysia samastojna."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Niapravilny adkaz"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Niemahvyma dałučycca"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Niemahčyma złučycca z \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Pravier złučeńnie albo pasprabuj paźniej."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Niemahčyma złučycca z \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Pravier złučeńnie albo paŭtary paźniej"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Pamyłka aŭtaryzacyi z \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
+
+#: ../src/common/connection.py:801
+#, fuzzy, 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 ""
+"Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych "
+"krynic. Adklučy jaje i paŭtary znoŭ."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Nia ściahnuta z-za niabačnaha statusu"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Naziralniki"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transparty"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Niama ŭ śpisie kantaktaŭ"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Nie staje fajłaŭ padtrymki Python dla D-Bus na hetym kamputary"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Niemahčyma vykarystać mahčymaści D-Bus dla Gajima"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Nazva kontu nia moža być pustoj."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Interfejs sesijaŭ niedastupny.\n"
+"Pasprabuj pračytać: http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "pieršaja"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "druhaja"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "treciaja"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "čaćviortaja"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "piataja"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "šostaja"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "siomaja"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "vośmaja"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "dziaviataja"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "dziasiataja"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "adzinaccataja"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "dvanaccataja"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 hadzinaŭ"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "piać chvilinaŭ na $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "dziesiać chvilinaŭ na $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "čverć na $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "dvaccać chvilinaŭ na $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "dvaccać piać chvilinaŭ na $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "pałova na $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "biez dvaccaci piaci chvilinaŭ $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "biez dvaccaci chvilinaŭ $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "biaz čverći $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "bieź dziesiaci chvilinaŭ $s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "bieź piaci chvilinaŭ $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "%1 hadzinaŭ"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Noč"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Śvitanak"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Ranica"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Amal poŭdzień"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Poŭdzień"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Papoŭdni"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Viečar"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Poźni viečar"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Pačatak tydnia"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Siaredzina tydnia"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Kaniec tydnia"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Vychodny!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Niapravilny znak u imiani karystalnika."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Patrabujecca adras servera."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Niapravilny znak u naźvie hostu."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Niapravilny znak u naźvie krynicy."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Zaniaty"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Zaniaty"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Niedastupny"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Achvotna parazmaŭlaju"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Achvotna parazmaŭlaju"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Dastupny"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Dastupny"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Dałučajusia"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Adyjšoŭ"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "Adł_učany"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Adłučany"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "N_iabačny"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?kantakt maje status:Nieviadomy"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?kantakt maje status:Jość pamyłki"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Da"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Dvuchbakovaja"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Zapyt (aŭtaryzacyi):Niama"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Aŭtaryzuj"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Maderatary"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Maderatar"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Udzielniki"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Udzielnik"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Naviedniki"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Naviednik"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Ułaśnik"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administratar"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Udzielnik"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "sočyć za razmovaj"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "robić štości inšaje"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "piša paviedamleńnie..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "pierastaŭ pisać"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "začyniŭ akno/kartku razmovy"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Dašli paviedamleńnie"
+msgstr[1] "Dašli paviedamleńnie"
+msgstr[2] "Dašli paviedamleńnie"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "indeksavańnie bazy razmoŭ"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Kont Gajim %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Prypynienaja"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Tłusty"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Nie razmaŭlaju "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Razmovy"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Tłusty"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Źmiest"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Zavieršana"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Źmiest"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Niadziejny"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "uri"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Vydal"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Adklučana"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
 msgstr "Adklučana"
 
-#: ../src/config.py:233
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Adklučana"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Dziejny"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Hrupa"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "paviedamleńnie"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Dziejny"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Niabačny"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "pieršaja"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Niamieckaja"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Madyfikuj"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Adłučany"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Hrupa"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "adzinaccataja"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Zatrymana"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Apošniaja źmiena:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Mianuška"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Splu"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Vulica:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Aŭtaryzavany"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Čas"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "dziaviataja"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Niapravilny host"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Viečar"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Uvod paviedamleńnia"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Ranica"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "pavodle hrupy"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Pracuju"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Viečar"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Vypichvajecca %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Dałučysia"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Pracuju"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Pracuju"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "pakoj"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Jem"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Źmianiajecca tema"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Vypichvajecca %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Jem"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Pracuju"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Vypichvajecca %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Jem"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Adłučajusia"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Jem"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Pryčyna"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Pryčyna"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Splu"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Pracuju"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Jem"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Hladžu film."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Jem"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Ja razmaŭlaju pa telefonie."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Pieradajecca"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Uvod paviedamleńnia"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Dałučany"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Adčyni jak _spasyłku"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Pracuju"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Uvod paviedamleńnia"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Pracuju"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Praz kožnyja %s _chvilinaŭ"
+msgid "Unable to bind to port %s."
+msgstr "Niemahčyma dałučycca da portu %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
 
-#: ../src/config.py:353
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Niemahčyma złučycca z hostam: pieravyšany termin čakańnia padčas adsyłańnia "
+"źviestak."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Host, akreśleny ŭ opcyi ft_override_host_to_send, niapravilny, tamu "
+"ihnarujecca."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "Kab paciahnuć kamunikacyju, treba ŭruchomić Gajim nanoŭ."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Pamyłka Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Kali łaska, pravier instalacyju Avahi."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Niemahčyma ŭruchomić lakalny servis"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Niemahčyma dałučycca da portu %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Niemahčyma źmianić status kontu \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Pamyłka dadańnia servisu. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Adklučana"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Dziejny"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Padzieja"
 
-#: ../src/config.py:684 ../src/gajim.py:2237
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Ukluč"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Asablivy</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: ../src/config.py:685 ../src/gajim.py:2238
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2654,242 +5884,251 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/config.py:1008
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: ../src/config.py:1008
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Atrymanaje pieršaje paviedamleńnie"
 
-#: ../src/config.py:1045
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Atrymanaje novaje paviedamleńnie"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Novy list na skryncy GMail"
 
-#: ../src/config.py:1260
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Nazva"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Pieradałučycca?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "Kali chočaš zadziejničać źmieny, treba pieradałučycca."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/config.py:1306
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Niepračytanyja paviedamleńni"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Akno razmovy adčynienaje dla kontu %s"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:1310 ../src/config.py:1909
-msgid "Unread events"
-msgstr "Niepračytanyja paviedamleńni"
-
-#: ../src/config.py:1311
+#: ../src/config.py:1710
 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:1315
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Taki kont užo zaniaty"
 
-#: ../src/config.py:1316
+#: ../src/config.py:1717
 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:1320 ../src/config.py:1324
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/config.py:1321
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/config.py:1325
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:1333 ../src/config.py:1339 ../src/config.py:1349
-#: ../src/config.py:2893
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Kiruj kontami"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Vyznač novuju nazvu dla hrupy %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Niapravilny JID"
 
-#: ../src/config.py:1340
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:1399
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:1400
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:1528 ../src/common/config.py:367
-msgid "Be right back."
-msgstr "Chutka viarnusia."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:1538
-msgid "Relogin now?"
-msgstr "Pieradałučycca?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:1539
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:1565
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Abiary svoj kluč OpenPGP"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../src/config.py:1573 ../src/dialogs.py:1190 ../src/dialogs.py:1376
-#: ../src/disco.py:419 ../src/profile_window.py:323
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/config.py:1574
+#: ../src/config.py:2097
 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:1578
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:1579
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:1603 ../src/config.py:3281
-msgid "Failed to get secret keys"
-msgstr "Niemahčyma atrymać sakretnyja klučy"
-
-#: ../src/config.py:1604 ../src/config.py:3282
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
-
-#: ../src/config.py:1607 ../src/config.py:3285
-msgid "OpenPGP Key Selection"
-msgstr "Vybar kluča OpenPGP"
-
-#: ../src/config.py:1608 ../src/config.py:3286
-msgid "Choose your OpenPGP key"
-msgstr "Abiary svoj kluč OpenPGP"
-
-#. Name column
-#: ../src/config.py:1843 ../src/disco.py:740 ../src/disco.py:1495
-#: ../src/disco.py:1733 ../src/history_window.py:78
-msgid "Name"
-msgstr "Nazva"
-
-#: ../src/config.py:1846
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1910
-msgid "Read all pending events before removing this account."
-msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
-
-#: ../src/config.py:1947
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Akno razmovy adčynienaje dla kontu %s"
-
-#: ../src/config.py:1948
-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:2007
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2008
+#: ../src/config.py:2134
 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:2104
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2106
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2172
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: ../src/config.py:2173
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Śpis udzielnikaŭ"
 
-#: ../src/config.py:2174
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2175
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Śpis administrataraŭ"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2224 ../src/disco.py:747 ../src/history_manager.py:155
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2241
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2266
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2268
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2897,11 +6136,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2270
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Dadajecca ŭdzielnik..."
 
-#: ../src/config.py:2271
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2909,11 +6148,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2273
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2274
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2921,11 +6160,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2276
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2277
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2933,7 +6172,7 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2278
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2949,101 +6188,85 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2382
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2399 ../src/roster_window.py:2738
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2400 ../src/roster_window.py:2734
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2401 ../src/roster_window.py:2739
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2501
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:2501
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:2502
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
-#: ../src/config.py:2503
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:2604
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Kali łaska, pravier, ci vyznačanyja pali servera i pakoju, albo vydal hetuju "
 "zakładku."
 
-#: ../src/config.py:2868
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:2869
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: ../src/config.py:2879 ../src/dialogs.py:1395
-msgid "Invalid password"
-msgstr "Niapravilny parol"
-
-#: ../src/config.py:2880
-msgid "You must enter a password for the new account."
-msgstr "Treba ŭvieści parol dla novaha kontu."
-
-#: ../src/config.py:2884 ../src/dialogs.py:1400
-msgid "Passwords do not match"
-msgstr "Paroli roźniacca"
-
-#: ../src/config.py:2885 ../src/dialogs.py:1401
-msgid "The passwords typed in both fields must be identical."
-msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
-
-#: ../src/config.py:2904
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Taki JID užo vykarystoŭvajecca"
 
-#: ../src/config.py:2905
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Hety kont užo naładžany dla Gajim."
 
-#: ../src/config.py:2922
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:2923 ../src/config.py:2958
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3052,274 +6275,398 @@ 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:2957
-msgid "Your new account has been created successfully"
-msgstr "Novy kont paśpiachova stvorany"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kantakt užo jość u śpisie kantaktaŭ"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
 
-#: ../src/config.py:2975
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3033
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Novy kont paśpiachova stvorany"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3034
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:344
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:356
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:361
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:377
+#: ../src/conversation_textview.py:712
 #, 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:390
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:393
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: ../src/conversation_textview.py:399
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Učora"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:764
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dzion tamu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Klijent kamunikacyi dla Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazva kantaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Hrupa"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "U hrupie"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "ID kluča"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nazva kantaktu"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Vyznač MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Paviedamleńnie statusu"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Zapišy jak šablon paviedamleńnia statusu"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Adras AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Adras MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Adras Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Kali łaska, zapoŭni źviestki ab kantakcie, kali chočaš dadać kantakt %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Jabber-klijent dla GTK+"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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:778
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:908
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Niemahčyma dałučycca da portu %s."
-
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
+"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 ""
-"Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
+"Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
+"movu ŭ opcyi speller_language."
 
-#: ../src/dialogs.py:1120
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, 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:1123
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: ../src/dialogs.py:1183 ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1686
 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:1206
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:1274 ../src/dialogs.py:1280
-#: ../src/groupchat_control.py:1469
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:1275 ../src/dialogs.py:1281
-#: ../src/groupchat_control.py:1470
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:1288
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:1327
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Kont \"%s\" dałučany da servera"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr ""
+"Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:1329
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:1330
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3328,270 +6675,377 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1355 ../src/dialogs.py:1714 ../src/dialogs.py:1845
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:1356 ../src/dialogs.py:1715 ../src/dialogs.py:1846
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, 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:1365 ../src/dialogs.py:1368
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:1368
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:1377
+#: ../src/dialogs.py:2001
 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:1396
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Niapravilny parol"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Paroli roźniacca"
+
+#: ../src/dialogs.py:2025
+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:1443 ../src/notify.py:212 ../src/notify.py:416
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/dialogs.py:1445 ../src/notify.py:220 ../src/notify.py:418
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #. chat message
-#: ../src/dialogs.py:1447 ../src/notify.py:239 ../src/notify.py:420
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
 #. single message
-#: ../src/dialogs.py:1447 ../src/notify.py:224 ../src/notify.py:420
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
 #. private message
-#: ../src/dialogs.py:1448 ../src/notify.py:231 ../src/notify.py:421
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: ../src/dialogs.py:1448 ../src/gajim.py:1291 ../src/notify.py:429
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:1450 ../src/gajim.py:1444 ../src/notify.py:423
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:1452 ../src/gajim.py:1263 ../src/gajim.py:1420
-#: ../src/notify.py:425
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:1454 ../src/gajim.py:1483 ../src/gajim.py:1505
-#: ../src/gajim.py:1522 ../src/notify.py:427
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:1455 ../src/gajim.py:1486 ../src/notify.py:427
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:1457 ../src/gajim.py:1160 ../src/notify.py:431
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: ../src/dialogs.py:1459 ../src/notify.py:204 ../src/notify.py:433
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: ../src/dialogs.py:1644
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:1646
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:1648
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1651
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1674
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1746
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1747
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: ../src/dialogs.py:1791
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:1793
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Kansol XML"
 
-#: ../src/dialogs.py:1916
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1920
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:1968
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, 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:1971
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:2013
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:2100
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:2196
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:2198
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:2268
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:2269
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Ty nie dałučyŭsia da pakoju."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2315
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:2978
+#, fuzzy
+msgid "Do you want to accept the invitation?"
+msgstr "%s choča dasłać tabie fajł:"
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:2387 ../src/dialogs.py:2432
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:2392
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:2494
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
 #. # means number
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:2573
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Umova"
 
-#: ../src/dialogs.py:2694
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "kali maju "
 
-#: ../src/disco.py:103
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Inšyja"
 
-#: ../src/disco.py:104 ../src/disco.py:105 ../src/disco.py:1281
-#: ../src/gajim.py:604 ../src/roster_window.py:272 ../src/roster_window.py:330
-#: ../src/roster_window.py:369 ../src/roster_window.py:451
-#: ../src/roster_window.py:483 ../src/roster_window.py:485
-#: ../src/roster_window.py:3913 ../src/roster_window.py:3915
-#: ../src/common/contacts.py:267 ../src/common/contacts.py:282
-#: ../src/common/helpers.py:43
-msgid "Transports"
-msgstr "Transparty"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:107
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Kanferencyja"
 
-#: ../src/disco.py:420
+#: ../src/disco.py:440
 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:499
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: ../src/disco.py:501
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: ../src/disco.py:641
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3599,175 +7053,434 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: ../src/disco.py:646 ../src/disco.py:927
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: ../src/disco.py:647
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: ../src/disco.py:727
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Prahladaj"
 
-#: ../src/disco.py:928
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: ../src/disco.py:1155 ../src/disco.py:1286
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Vykanaj zahad..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: ../src/disco.py:1323
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanavańnie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1504
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Karystalniki"
 
 #. Description column
-#: ../src/disco.py:1511
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Apisańnie"
 
 #. Id column
-#: ../src/disco.py:1518
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1741
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: ../src/disco.py:1767
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Nijaki"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:1773
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: ../src/disco.py:1779
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Kiraŭnik žurnałaŭ"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Paviedamleńnie dasłanaje"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Identyfikatar"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Šyfravańnie OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Uvachodnaje paviedamleńnie:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Ahulnaja"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Zdolnaści serveraŭ"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Fajł"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Prahres"
 
-#: ../src/filetransfers_window.py:161 ../src/filetransfers_window.py:215
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazva fajłu: %s"
 
-#: ../src/filetransfers_window.py:162 ../src/filetransfers_window.py:290
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:171 ../src/filetransfers_window.py:181
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:172
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:206
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavana"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:207
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "NIemahčyma złučycca ź inšym bokam."
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Atrymoŭca: %s"
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Pieradača fajłu spyniena inšym bokam"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: ../src/filetransfers_window.py:255
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Apisańnie: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nia moža dastupicca da hetaha fajłu"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Hety fajł vykarystoŭvajecca inšym pracesam."
 
-#: ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fajł: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/filetransfers_window.py:310 ../src/gtkgui_helpers.py:750
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: ../src/filetransfers_window.py:311 ../src/gtkgui_helpers.py:752
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3775,31 +7488,33 @@ msgstr ""
 "Fajł z takoj nazvaj užo isnuje, i nie staje pravoŭ dla nadpisańnia hetaha "
 "fajłu."
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:756
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:756
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:766
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
-#: ../src/filetransfers_window.py:340
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Zapišy fajł jak..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:421
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3807,69 +7522,69 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:497
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Niapravilny fajł"
 
-#: ../src/filetransfers_window.py:536
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fajł: "
 
-#: ../src/filetransfers_window.py:540
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nazva:"
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: ../src/filetransfers_window.py:750
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Prypyni"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu patrebny X-server. Vychad..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:186
 #, fuzzy
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:187
 #, fuzzy
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:189
 #, fuzzy
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:190
 #, fuzzy
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Biblijateka GTK+ nie padtrymvaje libglade"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3878,22 +7593,22 @@ msgstr ""
 "Kali łaska, vydal biblijateku GTK+ i zainstaluj najnoŭšuju stabilnuju "
 "versiju z %s"
 
-#: ../src/gajim.py:139
+#: ../src/gajim.py:199
 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:144
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajimu treba PySQLite2"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3903,11 +7618,11 @@ msgstr ""
 "ściahnuć z %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:300
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim užo vykonvajecca"
 
-#: ../src/gajim.py:301
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3915,84 +7630,169 @@ msgstr ""
 "Gajim užo vykonvajecca\n"
 "Usio adno ŭruchomić?"
 
-#: ../src/gajim.py:408
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Musiš vyznačyć parol"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Vyznač parol GPG dla kontu %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Niapravilny parol"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
+"Kali łaska, vyznač inšuju mianušku nižej:"
 
-#: ../src/gajim.py:409
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gajim.py:455 ../src/notify.py:435
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Prymaješ hety zapyt?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/gajim.py:775
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:820 ../src/gajim.py:833
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: ../src/gajim.py:866
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: ../src/gajim.py:867
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
 
-#: ../src/gajim.py:875
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: ../src/gajim.py:876
-msgid "You will always see him or her as offline."
-msgstr "Ciapier ty zaŭsiody budzieš bačyć status hetaha kantaktu jak adłučany."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:920
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/gajim.py:921 ../src/common/connection.py:433
-msgid "Check your connection or try again later."
-msgstr "Pravier złučeńnie albo pasprabuj paźniej."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s ciapier viadomy jak %s"
 
-#: ../src/gajim.py:1070 ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s maje ciapier status %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s maje ciapier status %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1073 ../src/groupchat_control.py:962
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s maje ciapier status %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1170
-msgid "Your passphrase is incorrect"
-msgstr "Parol niapravilny"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
 
-#: ../src/gajim.py:1171
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: ../src/gajim.py:1274
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Parol niapravilny"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1276
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -4000,89 +7800,223 @@ msgstr[0] "%d novy list"
 msgstr[1] "%d novyja listy"
 msgstr[2] "%d novych listoŭ"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1285
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Ad: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gajim.py:1506
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Atrymany fajł %(filename)s ad %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1510
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: ../src/gajim.py:1523
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1527
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: ../src/gajim.py:1640
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Dla kožnaha _paviedamleńnia"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gajim.py:1641
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Kanflikt imionaŭ karystalnikaŭ"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Złučeńnie"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Bolš nie pytajsia"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Šyfravańnie adklučanaje"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1987
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: ../src/gajim.py:2185
-msgid "Network Manager support not available"
-msgstr "Nie staje padtrymki Network Manager"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Zakładka ŭžo dadana"
 
-#: ../src/gajim.py:2264
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Nie staje padtrymki kiravańnia sesijami (nie staje modulu gnome.ui)"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Zakładka paśpiachova dadanaja"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Pakazvaje daviedku pa akreślenym zahadzie"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "zahad"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -4090,47 +8024,47 @@ msgstr ""
 "Pakazvaje śpis usich kantaktaŭ sa śpisu kantaktaŭ. Źviestki ab kožnym "
 "kantakcie źjaŭlajucca na novym radku"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "paviedamleńnie"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4139,19 +8073,19 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pakazvaje akno razmovy, kab dasyłać paviedamleńni kantaktu"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Kali akreślena, kantakt biarecca sa śpisu kantaktaŭ hetaha kontu"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:128
 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 "
@@ -4161,28 +8095,30 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "kluč pgp"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "Kali akreślena, paviedamleńnie budzie zašyfravana hetym publičnym klučom"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "Kali akreślena, paviedamleńnie budzie dasłanaje z hetaha kontu"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141
 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 "
@@ -4192,127 +8128,136 @@ msgstr ""
 "OpenPGP i kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki "
 "'kont', biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fajł"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "Kali akreślena, fajł budzie dasłany z hetaha kontu"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'kluč' jość nazvaj nałady, 'vartaść' jość vartaściu hetaj nałady"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "kluč"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Dadaje novy kantakt dla hetaha kontu"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Viartaje dziejny status (hlabalny, kali nie akreśleny kont)"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
 "kont)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Adčyniaje akno 'Pačni razmovu'"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Pačynaje razmovu dla hetaha kontu"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4320,35 +8265,72 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Absłuhoŭvaj spasyłki xmpp:/"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Dałučysia da pakoju"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "pakoj"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Pakoj:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "mianuška"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Mianuška nia znojdziena: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "parol"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Paroli roźniacca"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4357,29 +8339,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Užyvańnie: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4388,135 +8372,200 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: ../src/gajim-remote.py:438
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:442
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Niapravilnaja spasyłka"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Niemahčyma vydalić dziejnuju temu"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "nazva temy"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Niemahčyma vydalić dziejnuju temu"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:150
 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:124
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:322
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Žurnał razmoŭ"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Złučeńnie"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Aŭtaryzacyja anulavanaja"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:1142
 #, 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:855
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:859
+#: ../src/groupchat_control.py:1153
 #, 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:867
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../src/groupchat_control.py:869
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Suviaź: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s ciapier viadomy jak %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:960
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: ../src/groupchat_control.py:1082 ../src/groupchat_control.py:1100
-#: ../src/groupchat_control.py:1193 ../src/groupchat_control.py:1210
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/groupchat_control.py:1116
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Dla hetaha pakoju nie akreślena tema"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaprošany ŭ %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1136 ../src/groupchat_control.py:1164
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s nia jość pravilnym JIDam"
-
-#: ../src/groupchat_control.py:1247
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Takoha zahadu niama: /%s (kali chočaš dasłać hety tekst jak paviedamleńnie, "
-"ustaŭ pierad im \"/say\")"
-
-#: ../src/groupchat_control.py:1270
-#, python-format
-msgid "Commands: %s"
-msgstr "Zahady: %s"
-
-#: ../src/groupchat_control.py:1273
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4529,7 +8578,7 @@ msgstr ""
 "znachodzicca ŭ pakoji, jon budzie vypchnuty preč. Prabieły ŭ mianuškach nie "
 "padtrymvajucca."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4538,12 +8587,7 @@ msgstr ""
 "Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
 "asobaj."
 
-#: ../src/groupchat_control.py:1284
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
-
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4552,12 +8596,7 @@ msgstr ""
 "Užyvańnie: /%s [pryčyna], začyniaje dziejnaje akno albo kartku, pakazaŭšy "
 "akreślenuju pryčynu."
 
-#: ../src/groupchat_control.py:1289
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
-
-#: ../src/groupchat_control.py:1292
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4566,7 +8605,7 @@ msgstr ""
 "Užyvańnie: /%s <JID> [pryčyna], zaprašaje JID u dziejny pakoj, z akreślenym "
 "tłumačeńniem."
 
-#: ../src/groupchat_control.py:1296
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4575,7 +8614,7 @@ msgstr ""
 "Užyvańnie: /%s <pakoj>@<server>[/mianuška], dałučajecca da pakoju "
 "pakoj@server z akreślenaj mianuškaj."
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4585,16 +8624,7 @@ msgstr ""
 "Užyvańnie: /%s <mianuška> [pryčyna], vypichvaje asobu z takoj mianuškaj z "
 "pakoju z akreślenaj pryčynaj. Prabieły ŭ mianuškach nie padtrymvajucca."
 
-#: ../src/groupchat_control.py:1305
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad treciaj "
-"asoby). (naprykład, /%s rahoča, jak koń.)"
-
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4603,24 +8633,24 @@ msgstr ""
 "Užyvańnie: /%s <mianuška> [paviedamleńnie], adčyniaje akno pryvatnaj razmovy "
 "i dasyłaje paviedamleńnie asobie z akreślenaj mianuškaj."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Užyvańnie: /%s [tema], pakazvaje albo aktualizuje dziejnuju temu pakoju."
 
-#: ../src/groupchat_control.py:1325
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4628,96 +8658,69 @@ msgstr ""
 "Užyvańnie: /%s <paviedamleńnie>, dasyłaje paviedamleńnie, nie šukajučy "
 "inšych zahadaŭ."
 
-#: ../src/groupchat_control.py:1328
-#, python-format
-msgid "No help info for /%s"
-msgstr "Niama daviedki pa /%s"
-
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1837
 #, 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:1393
+#: ../src/groupchat_control.py:1839
 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:1397 ../src/roster_window.py:4059
-msgid "Do _not ask me again"
-msgstr "_Bolš nie pytajsia"
-
-#: ../src/groupchat_control.py:1431
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1432
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1441
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1442
+#: ../src/groupchat_control.py:1882
 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:1457
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1458
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1460
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1490
-msgid "Bookmark already set"
-msgstr "Zakładka ŭžo dadana"
-
-#: ../src/groupchat_control.py:1491
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
-
-#: ../src/groupchat_control.py:1500
-msgid "Bookmark has been added successfully"
-msgstr "Zakładka paśpiachova dadanaja"
-
-#: ../src/groupchat_control.py:1501
-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ŭ."
-
 #. ask for reason
-#: ../src/groupchat_control.py:1629
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:1630 ../src/groupchat_control.py:1913
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1912
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Znojdziena pamyłka prahramistaŭ"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4725,96 +8728,96 @@ msgstr ""
 "Heta nie fatalna, ale ŭsio roŭna varta paviedamić pra takuju sytuacyju "
 "raspracoŭnikam."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Paviedam pra pamyłku"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Padrabiaznaści"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:359
 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:376
+#: ../src/gtkgui_helpers.py:396
 #, 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:694
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie akreśleny jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:695
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chočaš zrabić Gajim zmoŭčanym klijentam Jabber?"
 
-#: ../src/gtkgui_helpers.py:696
+#: ../src/gtkgui_helpers.py:735
 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:795
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:805
 #, 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:805
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kantakty"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Mianuška"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Paviedamleńnie"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:224
 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:189
+#: ../src/history_manager.py:226
 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 "
@@ -4828,224 +8831,267 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Ekspartavańnie žurnałaŭ..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Vynikaŭ hetaj aperacyi niemahčyma anulavać."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Žurnał razmoŭ z %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s maje ciapier status %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:199
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s maje ciapier status %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Niemahčyma adčytać vyjavu"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:275
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:277
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:279
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Paviedamleńni"
 
-#: ../src/message_window.py:280
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:197
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Novaje paviedamleńnie ad %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Ahulnaja"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Ściežka da fajłu"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Takoha pakoju niama."
+
 #. keep identation
-#: ../src/profile_window.py:143
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Źviestki atrymanyja"
 
-#: ../src/profile_window.py:324
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Niemahčyma apublikavać asabistyja źviestki, nie dałučyŭšysia da servera."
 
-#: ../src/profile_window.py:336
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Dasyłańnie profilu..."
 
-#: ../src/profile_window.py:351
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Źviestki NIE apublikavanyja"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: ../src/profile_window.py:359
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: ../src/roster_window.py:172 ../src/roster_window.py:227
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:345 ../src/common/helpers.py:43
-msgid "Observers"
-msgstr "Naziralniki"
-
-#: ../src/roster_window.py:692 ../src/roster_window.py:3216
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Aŭtaryzacyja dasłanaja"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884 ../src/systray.py:206 ../src/systray.py:211
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "praz kont %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "da kontu %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "praz kont %s"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Aŭtaryzacyja anulavanaja"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "kontu %s"
+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:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Kiruj zakładkami..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
+"źmiennaja asiarodździa niapravilna akreślenaja)"
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "dla kontu %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Kiraŭnik žurnałaŭ"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:1068
-msgid "_Join New Group Chat"
-msgstr "_Dałučysia da pakoju"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Źmianiŭšy status na niabačny, ty adłučyśsia ad hetych pakojaŭ. Ty sapraŭdy "
+"chočaš stać niabačnym?"
+
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1398 ../src/roster_window.py:3411
-#: ../src/roster_window.py:3418
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
+"žurnałaŭ razmoŭ."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:1403
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5053,128 +9099,66 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:1411
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, 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:1517
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, 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:1548
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:1549
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:1785 ../src/roster_window.py:2046
-msgid "_New group chat"
-msgstr "_Novy pakoj"
-
-#: ../src/roster_window.py:1916
-msgid "I would like to add you to my roster"
-msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
-
-#: ../src/roster_window.py:2091 ../src/roster_window.py:2138
-msgid "Send Group M_essage"
-msgstr "_Dašli hrupavoje paviedamleńnie"
-
-#: ../src/roster_window.py:2117
-msgid "Re_name"
-msgstr "_Źmiani nazvu"
-
-#: ../src/roster_window.py:2144
-msgid "To all users"
-msgstr "Usim karystalnikam"
-
-#: ../src/roster_window.py:2147
-msgid "To all online users"
-msgstr "Usim dałučanym karystalnikam"
-
-#: ../src/roster_window.py:2183
-msgid "_Log on"
-msgstr "_Dałučysia"
-
-#: ../src/roster_window.py:2193
-msgid "Log _off"
-msgstr "_Adłučysia"
-
-#: ../src/roster_window.py:2315 ../src/roster_window.py:2386
-msgid "_Change Status Message"
-msgstr "Ź_miani paviedamleńnie statusu"
-
-#: ../src/roster_window.py:2458
-msgid "Authorization has been sent"
-msgstr "Aŭtaryzacyja dasłanaja"
-
-#: ../src/roster_window.py:2459
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Ciapier \"%s\" budzie viedać tvoj status."
-
-#: ../src/roster_window.py:2479
-msgid "Subscription request has been sent"
-msgstr "Zapyt aŭtaryzacyi dasłany"
-
-#: ../src/roster_window.py:2480
-#, 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:2492
-msgid "Authorization has been removed"
-msgstr "Aŭtaryzacyja anulavanaja"
-
-#: ../src/roster_window.py:2493
-#, 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:2685
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:2689
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5182,7 +9166,13 @@ msgstr ""
 "Vydaliŭšy hety kantakt, ty taksama anuluješ jahonuju aŭtaryzacyju. U vyniku "
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
-#: ../src/roster_window.py:2694
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Što chočaš zrabić?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5190,16 +9180,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:2697
+#: ../src/roster_window.py:3144
 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:2701
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5209,95 +9199,33 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:2737
-#, fuzzy
-msgid ""
-"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)"
-
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2765 ../src/common/connection.py:687
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, 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:2782
-msgid "Passphrase Required"
-msgstr "Musiš vyznačyć parol"
-
-#: ../src/roster_window.py:2783
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Vyznač parol GPG dla kontu %s."
-
-#: ../src/roster_window.py:2788
-msgid "Save passphrase"
-msgstr "Zachavaj parol"
-
-#: ../src/roster_window.py:2796
-msgid "Wrong Passphrase"
-msgstr "Niapravilny parol"
-
-#: ../src/roster_window.py:2797
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
-
-#: ../src/roster_window.py:2854 ../src/roster_window.py:2914
-msgid "You are participating in one or more group chats"
-msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
-
-#: ../src/roster_window.py:2855 ../src/roster_window.py:2915
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2872
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:2873
+#: ../src/roster_window.py:3192
 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:2975
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" ŭ vykanańni %(artist)s"
-
-#: ../src/roster_window.py:3412 ../src/roster_window.py:3419
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
-"žurnałaŭ razmoŭ."
-
-#: ../src/roster_window.py:4009
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:4011
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: ../src/roster_window.py:4053
+#: ../src/roster_window.py:3784
 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:4055
+#: ../src/roster_window.py:3786
 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 "
@@ -5307,118 +9235,322 @@ 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:4133
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Niapravilny fajł"
+
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
-msgid "Do you want to send that file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid "Do you want to send this file to %s:"
+msgid_plural "Do you want to send these files to %s:"
 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:4238
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "praz kont %s"
+
+#. add
+#: ../src/roster_window.py:4674
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Pieraniasi %s u hrupu %s"
+msgid "to %s account"
+msgstr "da kontu %s"
 
-#: ../src/roster_window.py:4245
+#. disco
+#: ../src/roster_window.py:4679
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Zrabi z %s i %s metakantakt"
+msgid "using %s account"
+msgstr "praz kont %s"
 
-#: ../src/roster_window.py:4432
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Kiruj zakładkami..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "kontu %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "dla kontu %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "Ź_miani paviedamleńnie statusu"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Абнавіць"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Dziejny"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Šukaj servisy..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "_Dašli hrupavoje paviedamleńnie"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Usim karystalnikam"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Usim dałučanym karystalnikam"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Źmiani nazvu kantaktu"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Dašli asobnaje paviedamleńnie"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transparty"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Pakažy _transparty"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kantakt adłučyŭsia"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Novaja hrupavaja razmova"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Kiraŭnik žurnałaŭ"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Dałučysia da pakoju"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
-#: ../src/systray.py:163
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "Ź_miani paviedamleńnie statusu..."
 
-#: ../src/systray.py:251
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "JID:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Krynica: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Apošni status: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " ad %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Złučeńnie"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kantakt adłučyŭsia"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Aŭtaryzacyja: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Pakoj:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Dziejny"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Typ:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Ściahni"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Zaciahni na server"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Pierasłany: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nie pačata"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Spyniena"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Zavieršana"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?status pieradačy:Prypyniena"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Zatrymana"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Pieradajecca"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5426,1519 +9558,450 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "ad %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Suviaź: "
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Aplikacyi</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 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:287
+#: ../src/vcard.py:321
 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:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
+msgstr ""
+
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "stvarajecca baza žurnałaŭ"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, 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:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim zaviaršaje vykanańnie"
-
-#: ../src/common/check_paths.py:115
-#, 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:131
-#, python-format
-msgid "creating %s directory"
-msgstr "stvarajecca kataloh %s"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Źmiani infarmacyju statusu"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Źmiani status"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Akreśli typ bačnaści i apisańnie"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Achvotna parazmaŭlaju"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Dałučany"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Adyjšoŭ"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Nie turbavać"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Niabačny - adłučany"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Apisańnie statusu:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Status źmianiŭsia."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s z pakoju %(room_jid)s"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Šyfravańnie OpenPGP"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "%s nie dasłaŭ svajho kluča OpenPGP, a ty taksama nie pryznačyŭ na jaho "
+#~ "kluča"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Takoha zahadu niama: /%s (kali chočaš dasłać hety tekst jak "
+#~ "paviedamleńnie, ustaŭ pierad im \"/say\")"
+
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad "
+#~ "treciaj asoby). (naprykład, /%s rahoča, jak koń.)"
+
+#~ msgid "Encryption enabled"
+#~ msgstr "Šyfravańnie ŭklučanaje"
+
+#~ msgid "Encryption disabled"
+#~ msgstr "Šyfravańnie adklučanaje"
+
+#~ msgid "_Retype Password:"
+#~ msgstr "Paŭta_ry parol:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "S_karystaj proxy"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Kali ŭklučanaja hetaja opcyja, usie lakalnyja kantakty, jakija "
+#~ "karystajucca prahramaj z zdolnaściami pratakołu Bonjour (naprykład, "
+#~ "iChat, Trillian, Gaim), buduć pakazanyja ŭ śpisie kantaktaŭ. Dla hetaha "
+#~ "tabie nia treba navat złučacca z serveram Jabber.\n"
+#~ "Hetaja zdolnaść budzie pracavać tolki z ustalavanym python-avahi i "
+#~ "servisam avahi-daemon."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Kali ŭ ciabie niekalki kontaŭ, Gajim budzie pakazvać usie kantakty ŭ "
+#~ "adzinym śpisie"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Uklučy miascovyja paviedamleńni"
+
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klikni, kab pahladzieć tekt papiarednich razmoŭ z hetym kantaktam"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kampaktny vyhlad    Alt+K"
+
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klikni, kab pahladzieć tekst minułych razmoŭ u hetym pakoji"
+
+#~ msgid "Build custom query"
+#~ msgstr "Stvary admysłovy zapyt"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Stvaralnik zapytaŭ..."
+
+#~ msgid "Accept"
+#~ msgstr "Dazvol"
+
+#~ msgid "Invitation Received"
+#~ msgstr "Atrymanaje zaprašeńnie"
+
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Farmat radka</b>"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Asabistaja kanfihuracyja interfejsu</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Taksama viadomy jak styl iChat"
+
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Naprykład, kali ty ŭžo ŭklučyŭ paviedamleńnie statusu dla stany Adyjšoŭ, "
+#~ "tady Gajim bolš nia budzie pytacca paćvierdžańnia hetaha tekstu"
+
+#~ msgid "Chat"
+#~ msgstr "Razmova"
+
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Vyznačaje adpraŭnik\n"
+#~ "Razmova\n"
+#~ "Asobnaje paviedamleńnie"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "_Kožnyja 5 chvilinaŭ"
+
+#~ msgid "Events"
+#~ msgstr "Padzieji"
 
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Ty nie dałučyŭsia da pakoju."
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Pakiń pakoji"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Zaznač pakoji, jakija chočaš pakinuć"
-
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Pakoji"
-
-#: ../src/common/commands.py:230
 #, fuzzy
-msgid "You left the following groupchats:"
-msgstr "Ty pakinuŭ nastupnyja pakoji:"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Pakazvaj nahadvańni z dapamohaj DBus i Notification-Daemon"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Adyjšoŭ\"."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Status \"Adyjšoŭ\" jak vynik biaździejnaści prahramy"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr ""
-"Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Niedastupny\"."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Status \"Niedastupny\" jak vynik biaździejnaści prahramy"
-
-#: ../src/common/config.py:83
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Uklučy lakalnyja paviedamleńni praz Zeroconf"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Mova pravierki pravapisu"
-
-#: ../src/common/config.py:92
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'always' - pakazvaj čas dla kožnaha paviedamleńnia.\n"
-"'sometimes' - pakazvaj čas praz kolkaść chvilinaŭ, akreślenuju ŭ opcyi "
-"print_ichat_every_foo_minutes.\n"
-"'never' - nie pakazvaj času."
-
-#: ../src/common/config.py:93
-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 ""
-"Pakazvaj niedakładny čas. Vartaść niedakładnaści ad 1 da 4 albo 0, kab "
-"adklučyć niedakładnaść. 1 akreślivaje samy dakładny čas, 4 akreślivaje samy "
-"niedakładny. Zadziejničana, kali opcyja print_time maje vartaść 'sometimes'."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
-
-#: ../src/common/config.py:97
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
-"ale i znaki * * nia vydalacca."
-
-#: ../src/common/config.py:100
-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žyvaje restrukturavanuju movu tekstavaj raźmietki dla dasyłańnia HTML, a "
-"taksama farmatavańnie ASCII, kali zadziejničana adpaviednaja opcyja. Hladzi "
-"syntaksyčnyja praviły pa adrasie: http://docutils.sourceforge.net/docs/ref/"
-"rst/restructuredtext.html (Kali chočaš karystacca hetaj mahčymaściu, "
-"zainstaluj docutils)"
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Gajim budzie aŭtamatyčna pakazvać novyja paviedamleńni ŭ adpaviednym aknie"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim budzie nahadvać ab novych padziejach u vypłyŭnym aknie ŭ pravym "
+#~ "nižnim kucie 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 budzie paviedamlać ab dałučeńni kantaktaŭ da servera ŭ pravym "
+#~ "nižnim kucie ekranu"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim tolki źmienić ikonu kantakta, jaki ŭčyniŭ novuju padzieju"
+
+#~ 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 ""
+#~ "Kali ŭklučanaja hetaja opcyja, Gajim budzie zapaminać pazycyju i pamiery "
+#~ "śpisu kantaktaŭ i voknaŭ razmoŭ i adnaŭlać ich pry nastupnym starcie"
+
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Nikoli\n"
+#~ "Zaŭsiody\n"
+#~ "Dla kožnaha konta\n"
+#~ "Dla kožnaha typu"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Vysyłańnie paviedamleńnia ab stanie _razmovy:"
+
+#~ msgid "Print time:"
+#~ msgstr "Pakazvaj čas:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Zachoŭvaj _pazycyju i pamiery śpisu kantaktaŭ i voknaŭ razmovy"
 
-#: ../src/common/config.py:110
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
-"movie inšaha ŭdzielnika pakoju."
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr ""
+#~ "Vystaŭlaj paviedamleńnie statusu jak nazvu hranaj _muzyčnaj kampazycyi"
 
-#: ../src/common/config.py:133
-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 ""
-"Hetaja opcyja dazvalaje tabie akreślić farmat miecin času ŭ razmovie. "
-"Naprykład, \"[%H:%M] \" akreślaje, što treba pakazvać \"[hadziny:chviliny] "
-"\". Hladzi padrabiaznyja źviestki ŭ dakumentacyi dla Pythonu pa funkcyi "
-"strftime: http://docs.python.org/lib/module-time.html"
+#~ msgid "Show only in _roster"
+#~ msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
+#~ msgid "The auto away status message"
+#~ msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Adyjšoŭ\""
 
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
+#~ msgid "The auto not available status message"
+#~ msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Niedastupny\""
 
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Traktuj usie ŭvachodnyja paviedamleńni jak:"
 
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Kolki chvilinaŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym "
-"aknie."
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Mahčymyja nastupnyja varyjanty nahadvańnia ab ździajśnieńni novych "
+#~ "padziejaŭ (ab paviedamleńniach, zapytach na pieradaču fajłaŭ i h.d.). "
+#~ "Zvažaj, što atrymańnie novaha paviedamleńnia adbyvajecca tolki tady, kali "
+#~ "ty atrymvaješ paviedamleńnie ad kantakta, ź jakim jašče na toj momant nia "
+#~ "vioŭ razmovy"
+
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Pracuje dla Rhythmbox i Muine. Dla inšych prahram hladzicie staronku "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Pašyranaje kiravańnie nahadvańniami..."
+
+#~ msgid "_Font:"
+#~ msgstr "_Šryft:"
 
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Dasyłaj paviedamleńnie praz Ctrl+Enter, a Enteram stvaraj novy radok "
-"(zmoŭčanyja pavodziny Mirabilis ICQ)."
+#~ 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 "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Kolki radkoŭ zachoŭvać dla Ctrl+KeyUP."
+#~ msgid "Address"
+#~ msgstr "Adras"
+
+#~ msgid "City:"
+#~ msgstr "Horad:"
 
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Albo specyjalny adrasm jaki ŭtrymlivaje %s, dzie %s jość słovam/vyrazam, "
-"albo radok 'WIKTIONARY', što aznačaje vykarystańnie Wiktionary."
+#~ msgid "Company:"
+#~ msgstr "Firma:"
 
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Kali hetaja opcyja ŭklučanaja, Gajimam možna kiravać praz gajim-remote."
+#~ msgid "Country:"
+#~ msgstr "Krajina:"
 
-#: ../src/common/config.py:154
-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 ""
-"Kali hetaja opcyja maje vartaść True, čakaj syhnałaŭ D-Bus ad NetworkManager "
-"i źmianiaj status kontaŭ (dla jakich opcyja listen_to_network_manager nia "
-"maje vartaści False i jakija synchranizujucca z hlabalnym stanam) zhodna "
-"statusu sietkavaha złučeńnia."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
-"vartaściaŭ: all, composing_only, disabled."
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Pakazanyja nahadvańni stanu razmovy ŭ voknach. Musić być adnoj z nastupnych "
-"vartaściaŭ: all, composing_only, disabled."
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
-"(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Zaŭsiody pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
-"hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Nikoli nie pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
-"hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
-
-#: ../src/common/config.py:164
-#, fuzzy
-msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
-msgstr ""
-"Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
-"adrasoŭ/pieranakiravańnia partoŭ."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Standart IEC vyznačaje, što KiB = 1024 bajtaŭ, KB = 1000 bajtaŭ."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Pakazvać padzieł kartak u voknach razmovy?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Pakazvać knopki začynieńnia na kartkach?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
-"pakojach."
-
-#: ../src/common/config.py:190
-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 ""
-"Kali opcyja maje vartaść True, Gajim zaviaršaje vykanańnie pa nacisku knopki "
-"X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
-"nahadvańnia."
-
-#: ../src/common/config.py:191
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Kali opcyja maje vartaść True, Gajim budzie praviarać, ci akreśleny jon jak "
-"zmoŭčany klijent Jabber."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Kali opcyja maje vartaść True, Gajim pakazvaje ikonu na kožnaj kartcy ź "
-"niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža być "
-"animavanaj."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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 ""
-"Kali opcyja maje vartaść True, Gajim budzie pytać avatary ŭ kožnaha "
-"kantaktu, jaki nia mieŭ avatara byłym razam, albo kali buferavany avatar "
-"sastareje."
+#~ msgid "Given:"
+#~ msgstr "Imia:"
 
-#: ../src/common/config.py:196
-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 ""
-"Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
-"surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
+#~ msgid "Middle:"
+#~ msgstr "Druhoje imia:"
 
-#: ../src/common/config.py:197
-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 ""
-"moža mieć vartaść: \"none\", \"all\" albo \"in_and_out\". Kali opcyja maje "
-"vartaść \"none\", Gajim nia budzie pakazvać paviedamleńni statusu ŭ "
-"pakojach, kali surazmoŭca źmianiaje status. Kali opcyja maje vartaść \"all"
-"\", Gajim budzie pakazvać usie takija paviedamleńni. Kali opcyja maje "
-"vartaść \"in_and_out\", Gajim budzie pakazvać tolki paviedamleńni ab "
-"dałučeńni/adłučeńni surazmoŭcaŭ."
+#~ msgid "Position:"
+#~ msgstr "Stanovišča:"
 
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
+#~ msgid "Prefix:"
+#~ msgstr "Prefiks:"
 
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr "Fonavy koler kantaktaŭ, kali jany tolki adłučylisia."
+#~ msgid "Role:"
+#~ msgstr "Funkcyja:"
 
-#: ../src/common/config.py:202
-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."
+#~ msgid "State:"
+#~ msgstr "Štat:"
 
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Nie pakazvaj avatara dla transpartu."
+#~ msgid "Suffix:"
+#~ msgstr "Sufiks:"
 
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Vydal ź śpisu kantaktaŭ"
 
-#: ../src/common/config.py:205
-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 ""
-"Kali opcyja maje vartaść True i kali instalavanyja GTK+ i PyGTK versii 2.8 "
-"albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
-"Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
+#~ msgid "A_ccounts"
+#~ msgstr "_Konty"
 
-#: ../src/common/config.py:207
-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 nia lubić danych SHA pry sprobie dałučeńnia da pakoju, "
-"abaronienaha parolem. Źmiani vartaść hetaj opcyi na False, kab pierastać "
-"słać takija danyja SHA."
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
 
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Kiruje aknom, u jakim pakazvajucca novyja paviedamleńni.\n"
-"'always' - Usie paviedamleńni pakazvajucca ŭ adnym aknie.\n"
-"'never' - Usie paviedamleńni pakazvajucca ŭ asobnych voknach.\n"
-"'peracct' - Paviedamleńnia z adnaho kontu pakazvajucca ŭ adnym aknie.\n"
-"'pertype' - Paviedamleńni adnaho typu (naprykład, pryvatnyja albo hrupavyja) "
-"pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
-"ŭruchomić Gajima nanoŭ."
+#~ msgid "Ask:"
+#~ msgstr "Pytaj:"
 
-#: ../src/common/config.py:211
-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."
+#~ msgid "Client:"
+#~ msgstr "Prahrama:"
 
-#: ../src/common/config.py:212
-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."
+#~ msgid "OS:"
+#~ msgstr "Aperacyjnaja systema:"
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "Chavaje knopki ŭ aknie pakoju."
+#~ msgid "Subscription:"
+#~ msgstr "Aŭtaryzacyja:"
 
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Chavaje knopki ŭ aknie pryvatnaj razmovy."
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Kali heta nia taja mova, dla jakoj treba padśviatlać słovy z pamyłkami, "
+#~ "vystaŭcie źmiennuju $LANG adpaviedna patrebam. naprykład, dla biełaruskaj "
+#~ "movy źmiaścicie zahad export LANG=be_BY.UTF-8 u fajle ~/.bash_profile, "
+#~ "albo hlabalna ŭ /etc/profile.\n"
+#~ "\n"
+#~ "Słovy z pamyłkami nie padśviatlajucca"
 
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Chavaje baner u aknie pakoju"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Praz kožnyja %s _chvilinaŭ"
 
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Chavaje baner u aknie pryvatnaj razmovy"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Treba ŭvieści parol dla novaha kontu."
 
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Chavaje śpis naviednikaŭ pakoju."
+#~ msgid "You will always see him or her as offline."
+#~ msgstr ""
+#~ "Ciapier ty zaŭsiody budzieš bačyć status hetaha kantaktu jak adłučany."
 
-#: ../src/common/config.py:218
-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 ""
-"U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
-"nia taja asoba, što napisała papiaredniaje paviedamleńnie."
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s maje ciapier status %s (%s)"
 
-#: ../src/common/config.py:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
+#~ msgid "%s is now %s"
+#~ msgstr "%s maje ciapier status %s"
 
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Śpis koleraŭ dla farbavańnia mianušak u pakojach."
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Ad: %(from_address)s"
 
-#: ../src/common/config.py:221
-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ŭ."
+#~ msgid "Network Manager support not available"
+#~ msgstr "Nie staje padtrymki Network Manager"
 
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
-"radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Nie staje padtrymki kiravańnia sesijami (nie staje modulu gnome.ui)"
 
-#: ../src/common/config.py:223
-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 ""
-"Kali opcyja maje vartaść True, ty zmožaš akreślić admoŭny pryjarytet ŭ aknie "
-"madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
-"nia budzieš atrymvać paviedamleńniaŭ z servera."
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Užyvańnie: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/config.py:224
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
-"Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s nia jość pravilnym JIDam"
 
-#: ../src/common/config.py:225
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
-"kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/config.py:226
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-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"
+#~ msgid "_New group chat"
+#~ msgstr "_Novy pakoj"
 
-#: ../src/common/config.py:227
-msgid ""
-"If True, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
-msgstr ""
+#~ msgid "_Log on"
+#~ msgstr "_Dałučysia"
 
-#: ../src/common/config.py:238
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
-"akreślivajucca ŭ opcyjach autopriority_*."
+#~ msgid "Log _off"
+#~ msgstr "_Adłučysia"
 
-#. yes, no, ask
-#: ../src/common/config.py:267
-msgid "Jabberd2 workaround"
-msgstr "Abychod dla Jabberd2"
+#~ msgid "Save passphrase"
+#~ msgstr "Zachavaj parol"
 
-#: ../src/common/config.py:271
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
-"adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Pieraniasi %s u hrupu %s"
 
-#: ../src/common/config.py:330
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Zrabi z %s i %s metakantakt"
 
-#: ../src/common/config.py:331 ../src/common/config.py:334
-msgid "Language for which we want to check misspelled words"
-msgstr "Mova, dla jakoj treba praviarać pravapis"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Chavaje knopki ŭ aknie pryvatnaj razmovy."
 
-#: ../src/common/config.py:340
-msgid "all or space separated status"
-msgstr "\"all\" albo statusy, padzielenyja prabiełami"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Dałučany da servera %s:%s z %s"
 
-#: ../src/common/config.py:341
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' albo 'both'"
-
-#: ../src/common/config.py:342 ../src/common/config.py:344
-#: ../src/common/config.py:345 ../src/common/config.py:348
-#: ../src/common/config.py:349
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' albo ''"
-
-#: ../src/common/config.py:355
-msgid "Sleeping"
-msgstr "Splu"
-
-#: ../src/common/config.py:356
-msgid "Back soon"
-msgstr "Chutka viarnusia"
-
-#: ../src/common/config.py:356
-msgid "Back in some minutes."
-msgstr "Viarnusia praz paru chvilinaŭ."
-
-#: ../src/common/config.py:357
-msgid "Eating"
-msgstr "Jem"
-
-#: ../src/common/config.py:357
-msgid "I'm eating, so leave me a message."
-msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
-
-#: ../src/common/config.py:358
-msgid "Movie"
-msgstr "Film"
-
-#: ../src/common/config.py:358
-msgid "I'm watching a movie."
-msgstr "Hladžu film."
-
-#: ../src/common/config.py:359
-msgid "Working"
-msgstr "Pracuju"
-
-#: ../src/common/config.py:359
-msgid "I'm working."
-msgstr "Ja pracuju."
-
-#: ../src/common/config.py:360
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../src/common/config.py:360
-msgid "I'm on the phone."
-msgstr "Ja razmaŭlaju pa telefonie."
-
-#: ../src/common/config.py:361
-msgid "Out"
-msgstr "Vyjšaŭ"
-
-#: ../src/common/config.py:361
-msgid "I'm out enjoying life."
-msgstr "Vyjšaŭ ciešycca z žyćcia."
-
-#: ../src/common/config.py:365
-msgid "I'm available."
-msgstr "Dastupny."
-
-#: ../src/common/config.py:366
-msgid "I'm free for chat."
-msgstr "Achvotna parazmaŭlaju."
-
-#: ../src/common/config.py:368
-msgid "I'm not available."
-msgstr "Niedastupny."
-
-#: ../src/common/config.py:369
-msgid "Do not disturb."
-msgstr "Nie turbavać."
-
-#: ../src/common/config.py:370 ../src/common/config.py:371
-msgid "Bye!"
-msgstr "Byvaj!"
-
-#: ../src/common/config.py:380
-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 ""
-"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:381
-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:390 ../src/common/optparser.py:195
-msgid "green"
-msgstr "zialony"
-
-#: ../src/common/config.py:394 ../src/common/optparser.py:181
-msgid "grocery"
-msgstr "bakaleja"
-
-#: ../src/common/config.py:398
-msgid "human"
-msgstr "čałaviek"
-
-#: ../src/common/config.py:402
-msgid "marine"
-msgstr "marski"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Niemahčyma adčytać modulu idle"
-
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/connection_handlers.py:215
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-msgid "Wrong host"
-msgstr "Niapravilny host"
-
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Host, akreśleny ŭ opcyi ft_override_host_to_send, niapravilny, tamu "
-"ihnarujecca."
-
-#: ../src/common/connection_handlers.py:216
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:607
-#, 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:1544
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Mianuška nie dazvolenaja: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1609
-#: ../src/common/connection_handlers.py:1612
-#: ../src/common/connection_handlers.py:1615
-#: ../src/common/connection_handlers.py:1618
-#: ../src/common/connection_handlers.py:1621
-#: ../src/common/connection_handlers.py:1624
-#: ../src/common/connection_handlers.py:1632
-msgid "Unable to join group chat"
-msgstr "Niemahčyma dałučycca da pakoju"
-
-#: ../src/common/connection_handlers.py:1610
-msgid "A password is required to join this group chat."
-msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
-
-#: ../src/common/connection_handlers.py:1613
-msgid "You are banned from this group chat."
-msgstr "Ty zablakavany ŭ hetym pakoji."
-
-#: ../src/common/connection_handlers.py:1616
-msgid "Such group chat does not exist."
-msgstr "Takoha pakoju niama."
-
-#: ../src/common/connection_handlers.py:1619
-msgid "Group chat creation is restricted."
-msgstr "Stvareńnie pakojaŭ abmiežavanaje."
-
-#: ../src/common/connection_handlers.py:1622
-msgid "Your registered nickname must be used."
-msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
-
-#: ../src/common/connection_handlers.py:1625
-msgid "You are not in the members list."
-msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
-
-#: ../src/common/connection_handlers.py:1633
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
-"Kali łaska, vyznač inšuju mianušku nižej:"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1676
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Aŭtaryzacyja anulavanaja"
-
-#: ../src/common/connection_handlers.py:1683
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1709
-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:1730
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "padpisany na %s"
-
-#: ../src/common/connection_handlers.py:1732
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "zapyt adpiski ad %s"
-
-#: ../src/common/connection_handlers.py:1734
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ciapier adpisany ad %s"
-
-#: ../src/common/connection_handlers.py:1851
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s nie adpaviadaje standartu RFC. Jon nia budzie dadany da tvajho śpisu "
-"kantaktaŭ. Vydal jaho z dapamohaj pryłady kiravańnia śpisam kantaktaŭ, "
-"naprykład, http://jru.jabberstudio.org/"
-
-#: ../src/common/connection.py:187
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
-
-#: ../src/common/connection.py:188
-msgid "Reconnect manually."
-msgstr "Pieradałučysia samastojna."
-
-#: ../src/common/connection.py:199 ../src/common/connection.py:226
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:225
-msgid "Invalid answer"
-msgstr "Niapravilny adkaz"
-
-#: ../src/common/connection.py:378
 #, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Niemahvyma dałučycca"
-
-#: ../src/common/connection.py:432 ../src/common/connection.py:531
-#: ../src/common/connection.py:983
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Niemahčyma złučycca z \"%s\""
-
-#: ../src/common/connection.py:446
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Dałučany da servera %s:%s z %s"
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:460
-#, fuzzy, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Niemahčyma złučycca z \"%s\""
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d niečytanaje asobnaje paviedamleńnie"
+#~ msgstr[1] "%d niečytanyja asobnyja paviedamleńni"
+#~ msgstr[2] "%d niečytanych asobnych paviedamleńniaŭ"
 
-#: ../src/common/connection.py:461
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr ""
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d niečytanaje hrupavoje paviedamleńnie"
+#~ msgstr[1] "%d niečytanyja hrupavyja paviedamleńni"
+#~ msgstr[2] "%d niečytanych hrupavych paviedamleńniaŭ"
 
-#: ../src/common/connection.py:468
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr ""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d niečytanaje pryvatnaje paviedamleńnie"
+#~ msgstr[1] "%d niečytanyja pryvatnyja paviedamleńni"
+#~ msgstr[2] "%d niečytanych pryvatnych paviedamleńniaŭ"
 
-#: ../src/common/connection.py:510
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr ""
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#: ../src/common/connection.py:516
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr ""
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr "Niemahčyma złučycca z hostam: Niapravilny adkaz servera."
 
-#: ../src/common/connection.py:532
-msgid "Check your connection or try again later"
-msgstr "Pravier złučeńnie albo paŭtary paźniej"
-
-#: ../src/common/connection.py:558
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Pamyłka aŭtaryzacyi z \"%s\""
-
-#: ../src/common/connection.py:559
-msgid "Please check your login and password for correctness."
-msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
-
-#: ../src/common/connection.py:586
-msgid "Error while removing privacy list"
-msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
-
-#: ../src/common/connection.py:587
-#, fuzzy, 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 ""
-"Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych "
-"krynic. Adklučy jaje i paŭtary znoŭ."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:685
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Parol OpenPGP nia vyznačany"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:814
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
-
-#: ../src/common/connection.py:870
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Tema: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1009
-msgid "Not fetched because of invisible status"
-msgstr "Nia ściahnuta z-za niabačnaha statusu"
-
-#: ../src/common/contacts.py:271
-msgid "Not in roster"
-msgstr "Niama ŭ śpisie kantaktaŭ"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Niemahčyma vykarystać mahčymaści D-Bus dla Gajima"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Nie staje pysqlite2 (python-pysqlite2) dla vykananaja. Vychad..."
-
-#: ../src/common/exceptions.py:30
-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:38
-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:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Interfejs sesijaŭ niedastupny.\n"
-"Pasprabuj pračytać: http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "pieršaja"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "druhaja"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "treciaja"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "čaćviortaja"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "piataja"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "šostaja"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "siomaja"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "vośmaja"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "dziaviataja"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "dziasiataja"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "adzinaccataja"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "dvanaccataja"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 hadzinaŭ"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "piać chvilinaŭ na $0"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "dziesiać chvilinaŭ na $0"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "čverć na $0"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dvaccać chvilinaŭ na $0"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dvaccać piać chvilinaŭ na $0"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "pałova na $0"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "biez dvaccaci piaci chvilinaŭ $1"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "biez dvaccaci chvilinaŭ $1"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "biaz čverći $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "bieź dziesiaci chvilinaŭ $s"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "bieź piaci chvilinaŭ $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "%1 hadzinaŭ"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Noč"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Śvitanak"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Ranica"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Amal poŭdzień"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Poŭdzień"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Papoŭdni"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Viečar"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Poźni viečar"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Pačatak tydnia"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Siaredzina tydnia"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Kaniec tydnia"
-
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Vychodny!"
-
-#: ../src/common/helpers.py:114
-msgid "Invalid character in username."
-msgstr "Niapravilny znak u imiani karystalnika."
-
-#: ../src/common/helpers.py:119
-msgid "Server address required."
-msgstr "Patrabujecca adras servera."
-
-#: ../src/common/helpers.py:124
-msgid "Invalid character in hostname."
-msgstr "Niapravilny znak u naźvie hostu."
-
-#: ../src/common/helpers.py:130
-msgid "Invalid character in resource."
-msgstr "Niapravilny znak u naźvie krynicy."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:170
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:173
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:177
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:180
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:184
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:187
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:190
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:219
-msgid "_Busy"
-msgstr "_Zaniaty"
-
-#: ../src/common/helpers.py:221
-msgid "Busy"
-msgstr "Zaniaty"
-
-#: ../src/common/helpers.py:224
-msgid "_Not Available"
-msgstr "_Niedastupny"
-
-#: ../src/common/helpers.py:229
-msgid "_Free for Chat"
-msgstr "_Achvotna parazmaŭlaju"
-
-#: ../src/common/helpers.py:231
-msgid "Free for Chat"
-msgstr "Achvotna parazmaŭlaju"
-
-#: ../src/common/helpers.py:234
-msgid "_Available"
-msgstr "_Dastupny"
-
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Dastupny"
-
-#: ../src/common/helpers.py:238
-msgid "Connecting"
-msgstr "Dałučajusia"
-
-#: ../src/common/helpers.py:241
-msgid "A_way"
-msgstr "_Adyjšoŭ"
-
-#: ../src/common/helpers.py:246
-msgid "_Offline"
-msgstr "Adł_učany"
-
-#: ../src/common/helpers.py:248
-msgid "Offline"
-msgstr "Adłučany"
-
-#: ../src/common/helpers.py:251
-msgid "_Invisible"
-msgstr "N_iabačny"
-
-#: ../src/common/helpers.py:257
-msgid "?contact has status:Unknown"
-msgstr "?kantakt maje status:Nieviadomy"
-
-#: ../src/common/helpers.py:259
-msgid "?contact has status:Has errors"
-msgstr "?kantakt maje status:Jość pamyłki"
-
-#: ../src/common/helpers.py:264
-msgid "?Subscription we already have:None"
-msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
-
-#: ../src/common/helpers.py:266
-msgid "To"
-msgstr "Da"
-
-#: ../src/common/helpers.py:270
-msgid "Both"
-msgstr "Dvuchbakovaja"
-
-#: ../src/common/helpers.py:278
-msgid "?Ask (for Subscription):None"
-msgstr "?Zapyt (aŭtaryzacyi):Niama"
-
-#: ../src/common/helpers.py:280
-msgid "Subscribe"
-msgstr "Aŭtaryzuj"
-
-#: ../src/common/helpers.py:289
-msgid "?Group Chat Contact Role:None"
-msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
-
-#: ../src/common/helpers.py:292
-msgid "Moderators"
-msgstr "Maderatary"
-
-#: ../src/common/helpers.py:294
-msgid "Moderator"
-msgstr "Maderatar"
-
-#: ../src/common/helpers.py:297
-msgid "Participants"
-msgstr "Udzielniki"
-
-#: ../src/common/helpers.py:299
-msgid "Participant"
-msgstr "Udzielnik"
-
-#: ../src/common/helpers.py:302
-msgid "Visitors"
-msgstr "Naviedniki"
-
-#: ../src/common/helpers.py:304
-msgid "Visitor"
-msgstr "Naviednik"
-
-#: ../src/common/helpers.py:310
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
-
-#: ../src/common/helpers.py:312
-msgid "Owner"
-msgstr "Ułaśnik"
-
-#: ../src/common/helpers.py:314
-msgid "Administrator"
-msgstr "Administratar"
-
-#: ../src/common/helpers.py:316
-msgid "Member"
-msgstr "Udzielnik"
-
-#: ../src/common/helpers.py:355
-msgid "is paying attention to the conversation"
-msgstr "sočyć za razmovaj"
-
-#: ../src/common/helpers.py:357
-msgid "is doing something else"
-msgstr "robić štości inšaje"
-
-#: ../src/common/helpers.py:359
-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:362
-msgid "paused composing a message"
-msgstr "pierastaŭ pisać"
-
-#: ../src/common/helpers.py:364
-msgid "has closed the chat window or tab"
-msgstr "začyniŭ akno/kartku razmovy"
-
-#: ../src/common/helpers.py:890
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d niečytanaje paviedamleńnie"
-msgstr[1] "%d niečytanyja paviedamleńni"
-msgstr[2] "%d niečytanych paviedamleńniaŭ"
-
-#: ../src/common/helpers.py:896
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d niečytanaje asobnaje paviedamleńnie"
-msgstr[1] "%d niečytanyja asobnyja paviedamleńni"
-msgstr[2] "%d niečytanych asobnych paviedamleńniaŭ"
-
-#: ../src/common/helpers.py:902
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d niečytanaje hrupavoje paviedamleńnie"
-msgstr[1] "%d niečytanyja hrupavyja paviedamleńni"
-msgstr[2] "%d niečytanych hrupavych paviedamleńniaŭ"
-
-#: ../src/common/helpers.py:908
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d niečytanaje pryvatnaje paviedamleńnie"
-msgstr[1] "%d niečytanyja pryvatnyja paviedamleńni"
-msgstr[2] "%d niečytanych pryvatnych paviedamleńniaŭ"
-
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
-
-#: ../src/common/optparser.py:181
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:190 ../src/common/optparser.py:191
-msgid "cyan"
-msgstr "cyan"
-
-#: ../src/common/optparser.py:308
-msgid "migrating logs database to indices"
-msgstr "indeksavańnie bazy razmoŭ"
-
-#: ../src/common/passwords.py:82
-#, python-format
-msgid "Gajim account %s"
-msgstr "Kont Gajim %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr "Niemahčyma złučycca z hostam: Niapravilny adkaz servera."
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Niemahčyma złučycca z hostam"
-
-#: ../src/common/zeroconf/client_zeroconf.py:339
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Niemahčyma złučycca z hostam: pieravyšany termin čakańnia padčas adsyłańnia "
-"źviestak."
-
-#: ../src/common/zeroconf/client_zeroconf.py:632
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Kab paciahnuć kamunikacyju, treba ŭruchomić Gajim nanoŭ."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Pamyłka Avahi"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Kali łaska, pravier instalacyju Avahi."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Niemahčyma ŭruchomić lakalny servis"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Niemahčyma dałučycca da portu %d."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Niemahčyma źmianić status kontu \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Pamyłka dadańnia servisu. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Niemahčyma złučycca z hostam"
 
 #~ msgid "Basc"
 #~ msgstr "Basckaja"
@@ -6955,9 +10018,6 @@ msgstr "Pamyłka dadańnia servisu. %s"
 #~ msgid "offline"
 #~ msgstr "адключаны"
 
-#~ msgid "I'm %s"
-#~ msgstr "Я %s"
-
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
 
@@ -6982,9 +10042,6 @@ msgstr "Pamyłka dadańnia servisu. %s"
 #~ msgid "_Before time:"
 #~ msgstr "_За пэўны час да:"
 
-#~ msgid "_Publish"
-#~ msgstr "_Абнавіць"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Атрымаць"
 
diff --git a/po/bg.po b/po/bg.po
index 3069177da..6704cdc65 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the Gajim package.
 # Yavor Doganov <yavor@doganov.org>, 2005, 2006, 2007.
 #
-# 
-# 
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:236 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:243 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-17 18:48+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-17 18:54+0200\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -35,44 +31,53 @@ msgid "Jabber IM Client"
 msgstr "Джабър клиент за бързи съобщения"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Изпращане на _еднократно съобщение..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Откриване на услуги..."
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Discover Services"
+msgstr "_Откриване на услуги"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Изпълнение на команда..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "С_тая"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Промяна на акаунт"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Промяна на акаунт..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -85,55 +90,81 @@ msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Изберете една от опциите по-долу:</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Натиснете, за да видите функционалностите (като MSN, ICQ транспорти) на "
 "Джабър сървърите"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Свързване при натискане на бутона „Приключване“"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+msgid "I already have an account I want to _use"
 msgstr "Вече имам регистриран акаунт, който искам да използвам"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Паро_ла:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Управление на..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Сървър-посредник:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Функционалности на сървърите"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Настройване на профила при свързване"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Използване на нестандартен хост/порт"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -141,67 +172,64 @@ msgstr ""
 "Трябва да имате акаунт, за да се свържете с\n"
 "мрежата на Джабър."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Вашия JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Хост:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Хост: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "По_рт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Въведете паролата отново:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "С_ървър:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Използване на сървър-посредник"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "И_ме на потребител:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разни</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Лични данни</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Акаунт"
 
@@ -210,19 +238,28 @@ msgid "Account Modification"
 msgstr "Промяна на акаунт"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Списък с администратори"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Auto-reconnect when connection is lost"
 msgstr "Автоматично свързване при разпадане на връзката"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "С_вързване при стартиране"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Пром_яна на парола"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -234,44 +271,61 @@ msgstr ""
 "използва TLS шифриране по подразбиране и избирайки тази опция, изключвате "
 "TLS."
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Избор на _ключ..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Натиснете, за да смените паролата на акаунта"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Свързване"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:458
-#: ../src/notify.py:480 ../src/notify.py:492 ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346 ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436 ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154 ../src/common/contacts.py:280
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Общи"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Хост: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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."
@@ -279,7 +333,8 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще излъчва повече IP адреси освен вашия "
 "собствен, така че файловият трансфер има повече шансове да работи добре."
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../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"
@@ -287,7 +342,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изпраща пакети за поддържане на връзката "
 "с цел избягване на разпадането ѝ."
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -296,7 +351,8 @@ msgstr ""
 "Ако тази опция е избрана, паролата ще се запази в ~/.gajim/config с права за "
 "четене само за потребителя."
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -305,7 +361,8 @@ msgstr ""
 "Ако тази опция е избрана, при стартиране Gajim ще се свързва автоматично, "
 "използвайки този акаунт."
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -315,44 +372,49 @@ msgstr ""
 "Ако тази опция е избрана, всяка промяна на общото състояние (от списъка в "
 "долната част на главния прозорец) ще променя и състоянието на този акаунт."
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Вашите личните данни, както са запазени на сървъра"
 
-#: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Управление на..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1617
-#: ../src/config.py:3409
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1197
-#: ../src/config.py:1202 ../src/config.py:1386 ../src/config.py:1607
-#: ../src/config.py:1616 ../src/config.py:1675 ../src/config.py:1749
-#: ../src/config.py:3399 ../src/config.py:3408 ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Няма"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Лични данни"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -362,19 +424,22 @@ msgstr ""
 "събитията от Джабър сървър, когато два или повече клиента са свързани с един "
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Приоритетът ще се сменя автоматично в зависимост от състоянието ви."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Сървър-посредник:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "_Ресурс:"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -388,90 +453,158 @@ msgstr ""
 "ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
 "приоритет ще получава събитията. (вижте по-долу)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Запазване на _паролата (рисковано за сигурността)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Използване на нестандартен хост/порт"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Използване на сървъри-посредници за файлови трансфери"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Име:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Настройки</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Ако тази опция е избрана, всички локални контакти, които използват клиент, "
-"съвместим с Bonjour (като iChat, Trillian или Gaim), ще бъдат показани в "
-"списъка.  Не е необходимо да сте свързани към Джабър сървър.\n"
-"Това е достъпно само при инсталиран „python-avahi“ и работещ „avahi-daemon“."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Е-поща:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Активиране"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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 "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
+
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ""
-"Ако имате два или повече акаунта и тази опция е избрана, Gajim ще изобразява "
-"всички контакти като от един акаунт."
+"Ако стандартния порт за входящи съобщения е неудобен за настройките ви, може "
+"да изберете друг тук.\n"
+"Може да помислите и да промените настройките на огнената стена, евентуално."
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Фамилия:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Смесване на акаунти"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Активиране на съобщения от/за локални контакти (link-local messaging)"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Пре_именуване"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "Пром_яна"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Премахване"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Използване на нестандартен порт:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -566,6 +699,7 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
@@ -592,46 +726,46 @@ msgid "Deletes Message of the Day"
 msgstr "Изтрива съобщението за деня"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Филтри за уединение"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Настройване на MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Показване на _XML конзола"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Актуализиране на MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Филтри за уединение"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Изпращане на съобщение от сървъра"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Изпращане на еднократно съобщение"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " отворен прозорец/подпрозорец с този контакт "
@@ -645,7 +779,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Условия</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуци</b>"
 
@@ -662,7 +796,7 @@ msgid "All statuses"
 msgstr "Всички състояния"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Отсъствам"
 
@@ -679,7 +813,7 @@ msgid "Have "
 msgstr "имам "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -688,7 +822,7 @@ msgid "Launch a command"
 msgstr "Изпълнение на команда"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
@@ -794,41 +928,53 @@ msgid "when I'm in"
 msgstr "когато съм"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "13-12-2003T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Ромео и Жулиета</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Запис:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Име на емисията:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Последно променена:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Получен е нов запис"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Стари записи"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Монолог"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Получихте нов запис:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Контакти"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Настроени съобщения за състояние</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Настроени съобщения за състояние</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Звуци</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Промяна на парола"
@@ -858,10 +1004,9 @@ msgid "Join _Group Chat"
 msgstr "_Влизане в стая"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "Добавяне към _списъка..."
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -881,39 +1026,70 @@ msgid "_Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Натиснете, за да видите стари разговори с този контакт"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Контакти"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Превключване на Open_PGP шифриране"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Превключване на Open_PGP шифриране"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Компактен изглед (Alt+C)"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Добавяне към _списъка..."
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "Ист_ория"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "По_кана в"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Наблюдатели"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Попълнете формуляра."
@@ -926,6 +1102,24 @@ msgstr "Настройки на стаята"
 msgid "Edit Groups"
 msgstr "Редактиране на групи"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Описание</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Функционалности на сървърите"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
@@ -979,7 +1173,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -987,7 +1181,7 @@ msgstr "П_родължаване"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Отваряне на папката"
 
@@ -1035,7 +1229,7 @@ msgstr "Персонализиране на темите на Gajim"
 msgid "Gone"
 msgstr "Отсъства"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Бездеен"
 
@@ -1076,58 +1270,72 @@ msgid "_Background:"
 msgstr "_Фон:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Смяна на псе_вдоним"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Промяна на _темата"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Натиснете, за да видите стари разговори в тази стая"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Настройки на _стаята"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Настройки на _стаята"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Добавяне на тази стая към отметките"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Добавяне на тази стая към отметките"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "_Председател"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Действия"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Администратор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Член"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Действия"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "Со_бственик"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Изпращане на лично съобщение"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Глас"
 
@@ -1135,22 +1343,19 @@ msgstr "_Глас"
 msgid "Create new post"
 msgstr "Създаване на ново съобщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "От"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Тема"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1165,56 +1370,58 @@ msgstr ""
 "цяло избягвайте да изтривате история за контакти, с които разговаряте в "
 "момента."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Мениджър на историята на разговорите"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Изтриване"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Изнасяне"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Мениджър на историята на разговорите"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Търсене в базата от данни"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Потребителска заявка"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "История на разговорите"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Изготвяне на заявки..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Търсене"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Търсене"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Приемане"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Отказване"
+#, fuzzy
+msgid "Search:"
+msgstr "Търсене"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Получена покана"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Запазване на разговорите"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1148
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
@@ -1223,14 +1430,12 @@ msgid "Join this room automatically when I connect"
 msgstr "Влизане в тази стая автоматично при свързване"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Парола:"
 
@@ -1239,12 +1444,12 @@ msgid "Recently:"
 msgstr "Скоро посетени:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1149
-#: ../src/disco.py:1516
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -1264,18 +1469,37 @@ msgstr "Ако тази опция е избрана, ще влизате в т�
 msgid "Manage Bookmarks"
 msgstr "Управление на отметките"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Изписване на състоянията:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Сървър:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Заглавие:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Настройки на стаята"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Настройки</b>"
@@ -1285,46 +1509,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Настройки</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Свързване по HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Име:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Паро_ла:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Използване на удостоверяване"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Хост:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Добавяне на контакт към списъка"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP шифриране"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Действия"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Изпращане"
 
@@ -1340,36 +1603,77 @@ msgstr "<b>Редактор на настройките за напреднал�
 msgid "<b>Applications</b>"
 msgstr "<b>Програми</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Действия</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Персонални</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Редактиране на правило</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Формат на реда</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Цветове на подпрозорците</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Настройки за Gmail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Зрителни уведомления</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</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
+msgid "<b>Custom</b>"
+msgstr "<b>Персонални</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Звуци</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Настройки за Gmail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Настроени съобщения за състояние</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Филтър за уединение</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Настроени съобщения за състояние</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Настройки</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Зрителни уведомления</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Напреднали"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Напреднали"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1379,53 +1683,27 @@ msgstr ""
 "Само при писане\n"
 "Изключено"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Позволяване изпращането на _информация за ОС"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Познато и като стил „iChat“"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr ""
-"_Винаги да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Например, ако сте активирали съобщението за състояние за „Отсъствам“, Gajim "
-"няма да ви пита повече за съобщението за състояние, когато го променяте; ще "
-"използва стандартното съобщение, настроено тук."
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Автоматично „_Отсъствам“ след:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Автоматично „Не съм на _разположение“ след:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Автоматично определяне при всяко стартиране на Gajim\n"
@@ -1434,71 +1712,58 @@ msgstr ""
 "Винаги да се използват стандартните програми на Xfce4\n"
 "Персонални"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Разговор"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "С_ъобщение за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:30
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"Изберете тази опция само ако някой, който не в списъка, ви притеснява или "
-"дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
-"контакт, който не е в списъка."
+"_Винаги да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "Настройване на цвят и шрифт на интерфейса"
 
-#: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Стандартни съобщения за състояние"
-
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Стандартен _набор икони за състояние:"
-
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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"
-"лично съобщение"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Показване на _допълнителни данни за е-поща"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Показвани уведомления при _разговор:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Показване на _аватари на контактите в списъка"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "Всеки 5 _минути"
+msgid "Display _extra email details"
+msgstr "Показване на _допълнителни данни за е-поща"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Емотикони:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Показване на _аватари на контактите в списъка"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Събития"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Показване на _аватари на контактите в списъка"
 
 #: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Показване на _аватари на контактите в списъка"
+
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Display status _messages of contacts in roster"
+msgstr "Показване на _съобщенията за състояние на контактите в списъка"
+
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1508,7 +1773,7 @@ msgstr ""
 "даден контакт. Тук може да укажете кои състояния бихте искали да се показват "
 "в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1517,40 +1782,25 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr ""
-"Автоматично ще се показват нови събития с изскачане на съответния прозорец"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Ще се появяват съобщения за уведомяване чрез изскачащ прозорец в долния "
-"десен ъгъл на екрана"
-
 #: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
-"включване на контакти"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
 #: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Скрива бутоните в прозореца на стаята."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Само ще се променя иконата на контакта, от който идва новото събитие"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
@@ -1562,13 +1812,24 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:53
 msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
+msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
 "и стаите"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1576,251 +1837,300 @@ msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка и "
-"прозореца за разговор на екрана за следващото стартиране на програмата."
+"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
+"и стаите"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Ако тази опция е избрана, ще се използват специфични за протокола икони за "
-"състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
-"състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
+"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
+"и стаите"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
-"съответните анимирани или статични емотикони."
+"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
+"и стаите"
 
-#: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
+#: ../data/glade/preferences_window.glade.h:60
+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:59
-msgid "Ma_nage..."
-msgstr "_Управление..."
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Изберете тази опция само ако някой, който не в списъка, ви притеснява или "
+"дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
+"контакт, който не е в списъка."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Никога\n"
-"Винаги\n"
-"Според акаунта\n"
-"Според типа"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
+"писма."
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Уведомяване за контакти при: "
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Ако тази опция е избрана, ще се използват специфични за протокола икони за "
+"състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
+"състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Уведомяване при нова поща от _Gmail"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "На _всяко съобщение"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
+"съответните анимирани или статични емотикони."
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "_Един прозорец за разговори:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "_Изпращани уведомления при разговор:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Един прозорец за разговори:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Изпълнение на з_вуци"
+msgid "Ma_nage..."
+msgstr "_Управление..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Настройки"
+#, fuzzy
+msgid "Notifications"
+msgstr "Промяна на акаунт"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Изписване на часа:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Уведомяване за контакти при: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr ""
-"Запазване на _положението и размера на списъка с контакти и прозорците за "
-"разговор"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Уведомяване за контакти при: "
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr ""
-"Настройване на съобщението за състояние да отразява _песента, която се "
-"изпълнява в момента"
+msgid "Notify on new _GMail email"
+msgstr "Уведомяване при нова поща от _Gmail"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Показване само в спис_ъка"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Лични данни"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "_Включване"
+msgid "Play _sounds"
+msgstr "Изпълнение на з_вуци"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "Изкл_ючване"
-
-#: ../data/glade/preferences_window.glade.h:77
 msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
 msgstr ""
-"Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
-"н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Status"
-msgstr "Състояние"
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "_Тема:"
+msgid "Preferences"
+msgstr "Настройки"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Автоматично съобщение за състояние при „Отсъствам“"
+msgid "Sign _in"
+msgstr "_Включване"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
+msgid "Sign _out"
+msgstr "Изкл_ючване"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Третиране на всички входящи съобщения като:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
+"н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Използване на набор и_кони на транспортите"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Подре_ждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Използване на стан_дартните за системата"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Състояние"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Икона в областта за уведомяване"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Стандартен _набор икони за състояние:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Когато се получи ново събитие (съобщение, запитване за файлов трансфер и т."
-"н.), могат да се използват следните методи за уведомяване. Забележете, че "
-"събития за нови съобщения възникват само ако са нови съобщения от контакт, с "
-"който не говорите в момента."
+#, fuzzy
+msgid "Style"
+msgstr "Блокирал"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "При получаване на ново събитие"
+msgid "T_heme:"
+msgstr "_Тема:"
 
 #: ../data/glade/preferences_window.glade.h:88
 msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
-"Работи с Rhythmbox и Muine. За повече програми, посетете http://trac.gajim."
-"org/wiki/GajimAndMusicPlayer."
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Контрол на уведомления за напреднали..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "Интернет _браузър:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Използване на набор и_кони на транспортите"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Файлов мениджър:"
+msgid "Use system _default"
+msgstr "Използване на стан_дартните за системата"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Шрифт:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "При получаване на ново събитие"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Осветяване на неправилно изписаните думи"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Автоматично „_Отсъствам“ след:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "Прене_брегване на събития от контакти, които не са в списъка"
+msgid "_Browser:"
+msgstr "Интернет _браузър:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "В_ходящо съобщение:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Показвани уведомления при _разговор:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "Запазване на промените на _състоянията на контактите"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Емотикони:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Програма за е-поща:"
+msgid "_File manager:"
+msgstr "_Файлов мениджър:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Никога"
+msgid "_Highlight misspelled words"
+msgstr "_Осветяване на неправилно изписаните думи"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Уведомяване"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Отваряне..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr ""
+"Пренебрегване на съдържанието на входящите съобщения, което не е обикновен "
+"текст"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "_Изходящо съобщение:"
+msgid "_Incoming message:"
+msgstr "В_ходящо съобщение:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "Пле_йър:"
+msgid "_Log status changes of contacts"
+msgstr "Запазване на промените на _състоянията на контактите"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Показване"
+msgid "_Mail client:"
+msgstr "_Програма за е-поща:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "Възстановяване на стандартните _цветове"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Автоматично „Не съм на _разположение“ след:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "Подре_ждане на контактите по състояние"
+msgid "_Open..."
+msgstr "_Отваряне..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "С_ъобщение за състояние:"
+msgid "_Outgoing message:"
+msgstr "_Изходящо съобщение:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_Адрес:"
+msgid "_Reset to Default Colors"
+msgstr "Възстановяване на стандартните _цветове"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Показвани уведомления при _разговор:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "С_ъобщение за състояние:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "_Влизане в стая"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Не е в списъка"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "минути"
 
@@ -1856,6 +2166,10 @@ msgstr "Всички"
 msgid "Allow"
 msgstr "Позволяване на"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Отказване"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
@@ -1864,7 +2178,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ред:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1862
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
@@ -1904,141 +2218,177 @@ msgstr "да ми изпращат състоянието си"
 msgid "to view my status"
 msgstr "да виждат състоянието ми"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Добавяне на правило</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Относно"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Аватар:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Адрес"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Рожден ден:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Аватар:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Персонални</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Рожден ден:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Персонални</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Град:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Звуци</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Фирма:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Държава:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Отдел:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "Е-поща:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Допълнителен адрес:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Фамилия:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Формат: гггг-мм-дд"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Персонални</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Собствено:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Страница в Интернет:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Добавяне на правило</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Персонални</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Псевдоним:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Бащино:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Телефон:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Още"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Условия</b>"
 
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Пощенски код:"
+
+#. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Лични данни"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Настройки</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Звуци</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Телефон:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Настройки</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Длъжност:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Пощенски код:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Настройки</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Обръщение:"
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Роля:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Относно"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Щат:"
+msgid "Click to set your avatar"
+msgstr "Натиснете, за да настроите аватара си"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Улица:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Формат: гггг-мм-дд"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Наставка:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Лични данни"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Работа"
 
@@ -2054,78 +2404,128 @@ msgstr "Премахване на акаунт _само от Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Премахване"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "_Запитване за виждане на състоянието на контакта"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Добавяне на специално _уведомление"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Задаване на Open_PGP ключ"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Редактиране на _групи"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Изпълнение на команда..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "По_кана в"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Изпращане на _еднократно съобщение"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Премахване"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Изпраща указан XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Изпращане на _еднократно съобщение..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Изпращане на _файл"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Позволение за виждане на състоянието ми"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "За_брана за виждане на състоянието ми"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028 ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "П_ремахване от списъка"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Преименуване на контакт"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Преименуване"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Записване"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "девет"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "А_каунти"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Добавяне на контакт..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Добавяне на _контакт"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Функционалности на сървърите"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2139,51 +2539,91 @@ msgstr "Често задавани въпроси (уеб страница)"
 msgid "Help online"
 msgstr "Помощ в Интернет (уеб страници)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Профил, _аватар"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Показване на т_ранспорти"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "П_оказване на списъка"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Ръководства"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Акаунти"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Откриване на услуги"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Действия"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Ръководства"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1254
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Изход"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Изпращане на _еднократно съобщение..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Изглед"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Изчакайте, докато се извлече списъка с команди..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Търсене"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Добавяне на _контакт"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Информация за контакта"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Търсене"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Отиване"
@@ -2192,10 +2632,6 @@ msgstr "_Отиване"
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Филтър:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Регистриране към"
@@ -2271,10 +2707,31 @@ msgstr "Искане за записване"
 msgid "_Deny"
 msgstr "_Отказване"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID на контакта, с който искате да разговаряте"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
@@ -2287,57 +2744,73 @@ msgstr "П_оказване на списъка"
 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:5
-msgid "Ask:"
-msgstr "Питане за:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Действия</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Клиент:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Персонални</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Ресурс:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Настройки</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Описание</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Персонални</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Коментари"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Настройки на _стаята"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Информация за контакта"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "ОС:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Ресурс:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Състояние:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Записване:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Още"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Запазване на разговорите"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Аватар:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2347,11 +2820,6 @@ msgstr "<b>Джабър трафик</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Вход в XML формат</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Активиране"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2370,15 +2838,29 @@ msgstr "_Съобщение"
 msgid "_Presence"
 msgstr "С_ъстояние"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Собствено име:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Добавяне на специално _уведомление"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Фамилия:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Задаване на Open_PGP ключ"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Редактиране на _групи"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Преименуване"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Промяна на акаунт..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2388,244 +2870,409 @@ msgstr "Локален JID:"
 msgid "Personal"
 msgstr "Лични данни"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ако стандартния порт за входящи съобщения е неудобен за настройките ви, може "
-"да изберете друг тук.\n"
-"Може да помислите и да промените настройките на огнената стена, евентуално."
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Ресурс:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Състояние:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Промяна на акаунт"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Използване на нестандартен порт:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Информация за контакта"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Активирана"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Изключена"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Булев израз"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Число"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Цвят"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Име на опцията"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Стойност"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Няма)"
 
-#. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Скрита"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "английски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "белоруски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "български"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "бретонски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "чешки"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "немски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "гръцки"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "британски английски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "есперанто"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "испански"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "баски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "френски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "хърватски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "италиански"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "норвежки (Bokmål)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "холандски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "норвежки (Nynorsk)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "полски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "португалски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "руски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "немски"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "словашки"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "шведски"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "китайски"
 
-#: ../src/chat_control.py:208 ../src/dialogs.py:1516
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Ако това не е езикът, за който искате осветяване на неправилно изписаните "
-"думи, настройте променливата $LANG. За български език напишете „export "
-"LANG=bg_BG“ или „export LANG=bg_BG.UTF-8“ в ~/.bash_profile или за системна "
-"настройка в /etc/profile.\n"
-"\n"
-"Осветяването на неправилно изписаните думи няма да се използва"
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
 
 #. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:852
-msgid "Chats"
-msgstr "Разговори"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Шифрирането е включено"
 
-#: ../src/chat_control.py:1034
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Не е в списъка"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "„%(title)s“ от %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Шифрирането е изключено"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Използване на удостоверяване"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+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:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Шифрирането е включено"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Команди: %s"
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Употреба: /%s, изчиства текстовия прозорец."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Употреба: /%s, скрива бутоните за разговор."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
+"трето лице (т.е. „/%s експлодира“)."
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Употреба: /%s, скрива бутоните за разговор."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Няма помощна информация за /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Това съобщение е шифрирано]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Шифрирането е изключено"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1406 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:842 ../src/gajim.py:843
-#: ../src/gajim.py:1187 ../src/roster_window.py:332
-#: ../src/roster_window.py:410 ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508 ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890 ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900 ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:43
-#: ../src/common/helpers.py:255
-msgid "Not in Roster"
-msgstr "Не е в списъка"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Това съобщение е шифрирано]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Това съобщение е шифрирано]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2633,29 +3280,2616 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/config.py:137 ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s вече е %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "създаване на база от данни за разговорите"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s e файл, а би трябвало да е папка"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Спиране на програмата"
+
+#: ../src/common/check_paths.py:136
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s e папка, а би трябвало да е файл"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "създаване на папка %s"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Промяна на информацията за състоянието"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Промяна на състоянието"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Настройване на съобщението за състояние и описанието му"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Свободен за разговор"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "На линия"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Не съм на разположение"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Не ме притеснявайте"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Изключен - изключване"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Описание на състоянието:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Състоянието беше променено."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Излизане от стаите"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s от стая %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Не сте влезли в стая."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Изберете стаите, които искате да напуснете"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Стаи"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Излязохте от следните стаи:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr " %d непрочетено съобщение"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Използване на DBus и Notification-Daemon за показване на уведомленията"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Автоматично състояние поради липса на активност"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr ""
+"Време в минути, след което състоянието да се променя на „Не съм на "
+"разположение“."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Автоматично състояние поради липса на активност"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Списък (разделен с интервали) на редове (акаунти и групи), които да се "
+"свиват автоматично."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "По подразбиране"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+"Активиране на съобщения от/за локални потребители (link-local/zeroconf)"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Език, който да се използва за проверката на правописа"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"„always“ - изписване на часа при всяко съобщение.\n"
+"„sometimes“ - изписване на часа през интервал, указан в "
+"„print_ichat_every_foo_minutes“.\n"
+"„never“ - никога да не се изписва часа."
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Изписване на часа при разговорите чрез „Относителен часовник“. Стойността на "
+"относителността е от 1 до 4, или 0 за премахването на относителния часовник. "
+"1 е най-прецизния часовник, 4 е най-относителния. Това е в сила само ако "
+"опцията „print_time“ е настроена на „sometimes“."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
+"символите * *."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Ако е избрана, използва реструктуриран текст за изпращане на HTML и "
+"форматиране в ASCII, ако е указано. За синтаксиса, вижте http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html (Ако искате да използвате "
+"това, инсталирайте docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак за добавяне след името на псевдонима при използване на автоматично "
+"допълване (TAB) в стая."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
+"той вече е използван от някой в стаята."
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Чрез тази опция може да персонализирате начина на изписване на времето в "
+"разговор. Например „[%H:%M] “ ще показва „час:минути] “. Вижте "
+"документацията на Питон относно „strftime“ за повече информация: http://docs."
+"python.org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Знаци, които се изобразяват в разговори след псевдонима"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Добавяне на * и [n] към заглавието на списъка?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Колко реда от предишния разговор да за запомнят при повторното отваряне на "
+"подпрозорец/прозорец."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Колко минути да отделят последните редове от предишния разговор."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
+"„WIKTIONARY“, което означава използване на wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
+"remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Ако е „True“, слуша за сигнали по DBus от NetworkManager и променя "
+"състоянието на акаунтите (при положение, че нямат настроена "
+"„listen_to_network_manager“ на „False“ и се синхронизират с общото "
+"състояние) в зависимост от състоянието на мрежовата връзка."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
+"„composing_only“, „disabled“."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Показвани уведомления за състоянието на разговора в прозорците за разговор. "
+"Може да бъде „all“, „composing_only“, „disabled“."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
+"„sometimes“), да се показва на всеки x минути."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
+"списък с адреси на стаи."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
+"списък с адреси на стаи."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
+"пренасочване на портове."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Уведомяване за събития в областта за уведомяване."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Показване на подпрозорец при един разговор?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Показване на бутона за затваряне на подпрозореца?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Списък с думи, отделени с точка и запетая, които ще се осветяват при "
+"разговор в стая."
+
+#: ../src/common/config.py:219
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Ако е „True“, се спира програмата при натискане на бутона „X“ на "
+"администратора на прозорци. Тази настройка е валидна само ако се използва "
+"иконата в областта за уведомяване."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Ако е „True“, Gajim ще проверява дали е стандартния Джабър клиент при всяко "
+"стартиране."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
+"непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
+"всеки контакт под името му списъка."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
+"нямал такъв последния път или пък има остарял кеширан аватар."
+
+#: ../src/common/config.py:229
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
+"когато контактът променя състоянието си."
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"Може да бъде „none“, „all“ или „in_and_out“. Ако е „none“, няма да се "
+"изписват състоянията в стаите, когато някой член сменя съобщението си за "
+"състояние или влиза/излиза в стаята. Ако е „all“, ще се изписват всички "
+"съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
+"в стаята“ или „Сульо напусна“."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Цвят на фона на контактите, които се включват."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Цвят на фона на контактите, които се изключват."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Ако е „True“, ще се използва по-малък шрифт от стандартния за възстановените "
+"съобщения."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Да не се показва аватара на транспорта."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Да не се показва списъка в панела."
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Ако е „True“ и инсталираните версии на GTK+ и PyGTK са поне 2.8, прозорецът "
+"ще мига (стандартното поведение при повечето мениджъри на прозорци) при "
+"задържане на чакащи събития."
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 не харесва информация от тип SHA при включване в стая, защитена с "
+"пароли. Настройте тази опция на „False“, за да спрете да изпращате "
+"информация от тип SHA при присъствие в стаи."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Контролира прозореца, където се отварят нови съобщения.\n"
+"„always“ - Всички съобщения се отварят в един прозорец.\n"
+"„never“ - Всички съобщения се отварят в собствен прозорец.\n"
+"„peracct“ - Съобщенията за всеки акаунт се отварят в специфичен прозорец.\n"
+"„pertype“ - Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
+"специфичен прозорец. Забележете, че промяната на тази опция изисква "
+"рестартирането на Gajim, за да влезе в сила."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Ако е „False“, повече няма да виждате аватар в прозореца за разговор."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+"Ако е „True“, натискането на клавиша „Escape“ затваря прозореца/подпрозореца."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Скрива бутоните в прозореца на стаята."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Скрива лентата в прозореца на стаята"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Скрива лентата в прозорец за разговор с два контакта"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Скрива списъка на участниците в прозореца на стаята."
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
+"който е написал предното съобщение."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Изпращане на съобщението и затваряне на прозореца"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Списък с цветове, които да се използват за оцветяване на псевдонимите в "
+"стаите."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
+"контакти? Празен низ означава никога да не се показва диалогов прозорец."
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Ако е „True“, ще може да настроите отрицателен приоритет за акаунта в "
+"прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
+"отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Ако е „True“, Gajim ще използва набора на ключове на GNOME (gnome-keyring), "
+"ако е достъпен, за да запазва информация за паролите на акаунтите."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Ако е „True“, Gajim ще показва броя на включените контакти и общия брой в "
+"редовете за акаунти и групи."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
+"съобщения се третират като от указания тип."
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
+"Приоритетите се настройват в опциите „autopriority_*“."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Заобикалка заради Jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
+"посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Активиран ли е OpenPGP за този контакт?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Език, за който желаете да се проверяват сгрешените думи."
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "„all“ или състояния, разделени с интервал"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "„yes“, „no“ или „both“"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "„yes“, „no“ или „“"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Спя"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Връщам се скоро"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Ще се върна след малко."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Хапвам"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Хапвам, така че ми оставете съобщение."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Филм"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Гледам филм."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Работя"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Работя."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Телефон"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Говоря по телефона."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Навън"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Наслаждавам се на живота навън."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "На линия съм."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Свободен за разговор."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Сега се връщам."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Не съм на разположение."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Не ме притеснявайте."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Довиждане!"
+
+#: ../src/common/config.py:441
+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_higlighted_words“ или когато съобщение съдържа псевдонима ви."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "зелена"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "колониална"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "хуманна"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "морска"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Неуспех при зареждането на модула „idle“"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Грешен хост"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Разширението не се поддържа"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Псевдонимът не е позволен: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Неуспех при влизането в стаята"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вие сте отлъчени от тази стая."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Такава стая не съществува."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Създаването на стаи е ограничено."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Трябва да се използва регистрирания ви псевдоним."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Не сте в списъка с членове."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Упълномощаването беше прекратено"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr ""
+"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+"roster."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "вече сме записани за %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "искане за отписване от %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "вече сме отписани от %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s не е съгласно стандарта по RFC. Няма да бъде добавен към списъка. "
+"Използвайте инструменти за управление на списък като http://jru.jabberstudio."
+"org/, за да го премахнете."
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Не беше зададена парола за OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Неуспех при зареждането на модула „idle“"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+#, fuzzy
+msgid "CRL is not yet valid"
+msgstr "%s не е валидно ниво за дневник"
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Невалидно потребителско име"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Връзката на акаунт „%s“ се разпадна"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Свържете се наново."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Невалиден отговор"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Неуспех при свързването"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Не може да се осъществи свързване с „%s“"
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Проверете връзката или опитайте отново по-късно."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Не може да се осъществи свързване с „%s“"
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Връзката на акаунт „%s“ се разпадна"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Проверете връзката или опитайте отново по-късно"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Неуспех при удостоверяването с „%s“"
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Проверете дали името и паролата са правилни."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Грешка при премахването на списъка за уединение"
+
+#: ../src/common/connection.py:801
+#, fuzzy, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
+"свързаните ви ресурси. Изключете го и опитайте отново."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr ""
+"[Това съобщение е *шифрирано* (вижте JEP:„27“)]\n"
+"[This message is *encrypted* (See: JEP:`27')]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Тема: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Наблюдатели"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Транспорти"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Не е в списъка"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Възможностите за D-Bus не могат да бъдат използвани"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
+"Спиране на програмата..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Трябва да посочите някакво име на акаунта."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Услугата не е налична: Gajim не е стартиран или „remote_control“ е „False“"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Липсва „session bus“.\n"
+"Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "един"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "два"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "три"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "четири"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "пет"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "шест"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "седем"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "осем"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "девет"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "десет"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "единадесет"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "дванадесет"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 часа"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "$0 и пет"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "$0 и десет"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "$0 и петнадесет"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "$0 и двадесет"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "$0 и двадесет и пет"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "$0 и половина"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "$1 без двадесет и пет"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "$1 без двадесет"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "$1 без петнадесет"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "$1 без десет"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "$1 без пет"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 часа"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Нощ"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Рано сутрин"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Сутрин"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Почти обед"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Обед"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Следобед"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Вечер"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Късно вечер"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Началото на седмицата"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Средата на седмицата"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Края на седмицата"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Събота и неделя!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Невалиден символ в потребителското име."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Необходим е адрес на сървъра."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Невалиден символ в името на хоста."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Невалиден символ в ресурса."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Зает"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Зает"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Не съм на разположение"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Свободен за разговор"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Свободен за разговор"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "На _линия"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "На линия"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Свързване"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Отсъствам"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Изключен"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Изключен"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "Не_видим"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Неизвестно"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Има грешки"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Няма"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "За"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Двустранно"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Няма"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Записване"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Не е установен"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Председатели"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Председател"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Участници"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Участник"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Посетители"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Посетител"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Няма"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Собственик"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Администратор"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Член"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "обръща внимание на разговора"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "прави нещо друго"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "пише съобщение..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "спря да пише съобщение"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "затвори прозореца или подпрозореца"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Изпращане на съобщение"
+msgstr[1] "Изпращане на съобщение"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "грешка: %s не може да бъде отворен за четене"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "синьозелена"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "мигриране на базата от данни с дневници към индекси"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Акаунт „%s“"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Временно преустановен"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Получер"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "имам "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Разговори"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Получер"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Ръководства"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Завършил"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Ръководства"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Изключена"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "адрес"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Изтриване"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
 msgstr "Изключени"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Изключени"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Изключени"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Активирана"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Група"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Хост:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "съобщение"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Активирана"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Невидим"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "един"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Хост:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "немски"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "Пром_яна"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Изключен"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Група"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "единадесет"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Блокирал"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Последно променена:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Псевдоним"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Спя"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Улица:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Записан"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Време"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "девет"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Грешен хост"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Вечер"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Пише"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Сутрин"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "всички в групата"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Работя"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Вечер"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Изритване на %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Влизане"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Работя"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Работя"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "стая"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Хапвам"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Промяна на темата"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Изритване на %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Хапвам"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Работя"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Изритване на %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Хапвам"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "Изкл_ючване"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Хапвам"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Причина"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Причина"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Спя"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Работя"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Хапвам"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Гледам филм."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Хапвам"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Говоря по телефона."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Прехвърляне"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Пише"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "На линия"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Отваряне като _връзка"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Работя"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Пише"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Работя"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Неуспех при свързването с порт %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Навярно имате стартирана друга инстанция на Gajim. Файловият трансфер ще "
+"бъде отменен."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Неуспех при установяването на връзка с хоста: Изтичане на допустимото време "
+"при изпращането на данните."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Хостът, който сте конфигурирали в опцията „ft_override_host_to_send“ не е "
+"валиден, така че се пренебрегва."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"За да продължите да изпращате и получавате съобщения, трябва да се свържете "
+"наново."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Грешка в Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Всеки %s _минути"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Изпращането и получаването на съобщения тип „link-local“ може и да не "
+"функционира правилно."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Проверете дали Avahi е инсталиран."
 
-#: ../src/config.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Неуспех при стартирането на локална услуга"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Неуспех при свързването с порт %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Проверете дали е стартиран avahi-daemon."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Не сте свързани и не сте видими за другите. Съобщението ви не можа да бъде "
+"изпратено."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Това съобщение е шифрирано]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Грешка при добавянето на услугата. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Изключени"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:684 ../src/gajim.py:2222
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Стандартни съобщения за състояние"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Активиране"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Персонални</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:685 ../src/gajim.py:2223
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2664,248 +5898,257 @@ msgstr ""
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:1046
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Следващо получено съобщение"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Следващо получено съобщение"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
 
-#: ../src/config.py:1261
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Име"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Свързване наново?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
+"наново."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Непрочетени събития"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Имате активни разговори за акаунт „%s“"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
+"продължите?"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1311 ../src/config.py:1905
-msgid "Unread events"
-msgstr "Непрочетени събития"
-
-#: ../src/config.py:1312
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1316
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1317
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1321 ../src/config.py:1325
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1322
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1326
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1334 ../src/config.py:1340 ../src/config.py:1350
-#: ../src/config.py:3008
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Управление на акаунти"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Въведете ново име за група „%s“"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1341
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:1400
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1401
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:1529 ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Сега се връщам."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1539
-msgid "Relogin now?"
-msgstr "Свързване наново?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1540
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-"Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
-"наново."
+#: ../src/config.py:2076
+msgid "OpenPGP Key Selection"
+msgstr "Избор на OpenPGP ключ"
+
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Изберете вашия OpenPGP ключ"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1567
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1574 ../src/dialogs.py:1130 ../src/dialogs.py:1316
-#: ../src/disco.py:418 ../src/profile_window.py:313
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:1575
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1579
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:1580
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:1604 ../src/config.py:3396
-msgid "Failed to get secret keys"
-msgstr "Неуспех при извличането на частните ключове"
-
-#: ../src/config.py:1605 ../src/config.py:3397
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
-
-#: ../src/config.py:1608 ../src/config.py:3400
-msgid "OpenPGP Key Selection"
-msgstr "Избор на OpenPGP ключ"
-
-#: ../src/config.py:1609 ../src/config.py:3401
-msgid "Choose your OpenPGP key"
-msgstr "Изберете вашия OpenPGP ключ"
-
-#. Name column
-#: ../src/config.py:1839 ../src/disco.py:739 ../src/disco.py:1465
-#: ../src/disco.py:1703 ../src/history_window.py:78
-msgid "Name"
-msgstr "Име"
-
-#: ../src/config.py:1842
-msgid "Server"
-msgstr "Сървър"
-
-#: ../src/config.py:1906
-msgid "Read all pending events before removing this account."
-msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
-
-#: ../src/config.py:1943
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Имате активни разговори за акаунт „%s“"
-
-#: ../src/config.py:1944
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr ""
-"Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
-"продължите?"
-
-#: ../src/config.py:2003
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2004
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2238
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2240
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2306
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2308
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2309
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2342 ../src/disco.py:746 ../src/history_manager.py:155
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2359
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Отлъчване..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2382
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2913,11 +6156,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Добавяне на член..."
 
-#: ../src/config.py:2385
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2925,11 +6168,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик..."
 
-#: ../src/config.py:2388
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2937,11 +6180,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2390
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор..."
 
-#: ../src/config.py:2391
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2949,7 +6192,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2965,99 +6208,83 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2497
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2514 ../src/roster_window.py:2733
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2515 ../src/roster_window.py:2729
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2516 ../src/roster_window.py:2734
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2530
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2531
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2616
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:2616
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:2618
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:2686
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2983
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2994 ../src/dialogs.py:1335
-msgid "Invalid password"
-msgstr "Невалидна парола"
-
-#: ../src/config.py:2995
-msgid "You must enter a password for the new account."
-msgstr "Трябва да въведете парола за новия акаунт."
-
-#: ../src/config.py:2999 ../src/dialogs.py:1340
-msgid "Passwords do not match"
-msgstr "Паролите не съвпадат"
-
-#: ../src/config.py:3000 ../src/dialogs.py:1341
-msgid "The passwords typed in both fields must be identical."
-msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
-
-#: ../src/config.py:3019
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Дублиран Jabber ID"
 
-#: ../src/config.py:3020
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Този акаунт вече е конфигуриран в Gajim."
 
-#: ../src/config.py:3037
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3038 ../src/config.py:3073
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3066,207 +6293,299 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3072
-msgid "Your new account has been created successfully"
-msgstr "Новият акаунт беше създаден успешно"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Невалидно потребителско име"
+
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Въведете новия псевдоним, който искате да използвате:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Контактът вече е в списъка"
 
-#: ../src/config.py:3090
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3148
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Новият акаунт беше създаден успешно"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3149
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Текстът под този ред е последното, което е казано откакто за последен път "
 "сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:712
 #, 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:386
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:790
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Джабър клиент за бързи съобщения"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Идентификатор на ключ"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Настройване на MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Съобщение за състояние"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Адрес на AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Номер на GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Номер на ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Адрес на MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Адрес на Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr ""
+"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+"roster."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Джабър клиент"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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:778
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@doganov.org>\n"
@@ -3275,70 +6594,104 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:908
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Неуспех при свързването с порт %s."
-
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
+"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 ""
-"Навярно имате стартирана друга инстанция на Gajim. Файловият трансфер ще "
-"бъде отменен."
+"За да използвате проверката за правопис, трябва да инсталирате %s речник или "
+"да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/dialogs.py:1060
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%s“ от %s"
 
-#: ../src/dialogs.py:1063
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:1123 ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:1146
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:1214 ../src/dialogs.py:1220
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Невалидно потребителско име"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Jabber ID на стаята съдържа непозволени знаци."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:1215 ../src/dialogs.py:1221
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:1267
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Трябва да сте свързани, за да променяте паролата."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Сървър"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Акаунт „%s“ е свързан към сървъра"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Трябва да сте свързани, за да влезете в стая."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:1269
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3347,269 +6700,376 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1295 ../src/dialogs.py:1654 ../src/dialogs.py:1785
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:1296 ../src/dialogs.py:1655 ../src/dialogs.py:1786
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:1305 ../src/dialogs.py:1308
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:1308
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:1336
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Невалидна парола"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Паролите не съвпадат"
+
+#: ../src/dialogs.py:2025
+msgid "The passwords typed in both fields must be identical."
+msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1383 ../src/notify.py:212 ../src/notify.py:416
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:1385 ../src/notify.py:220 ../src/notify.py:418
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#: ../src/dialogs.py:1387 ../src/notify.py:239 ../src/notify.py:420
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:1387 ../src/notify.py:224 ../src/notify.py:420
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:1388 ../src/notify.py:231 ../src/notify.py:421
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:1388 ../src/gajim.py:1282 ../src/notify.py:429
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:1390 ../src/gajim.py:1435 ../src/notify.py:423
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:1392 ../src/gajim.py:1254 ../src/gajim.py:1411
-#: ../src/notify.py:425
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:1394 ../src/gajim.py:1474 ../src/gajim.py:1496
-#: ../src/gajim.py:1513 ../src/notify.py:427
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:1395 ../src/gajim.py:1477 ../src/notify.py:427
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:1397 ../src/gajim.py:1151 ../src/notify.py:431
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: ../src/dialogs.py:1399 ../src/notify.py:204 ../src/notify.py:433
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: ../src/dialogs.py:1584
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:1586
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:1588
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1591
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1686
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:1731
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:1856
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:1908
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ред: %s, действие: %s, вид: %s, стойност: %s"
 
-#: ../src/dialogs.py:1911
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %s, действие: %s"
 
-#: ../src/dialogs.py:1953
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:2040
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:2136
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:2138
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Не сте влезли в стая."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact ви покани в стая %(room_jid)s."
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2255
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2317
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:2327 ../src/dialogs.py:2372
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:2362
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
 #. # means number
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:2513
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:2634
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "когато съм "
 
-#: ../src/disco.py:102
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Други"
 
-#: ../src/disco.py:103 ../src/disco.py:104 ../src/disco.py:1251
-#: ../src/gajim.py:596 ../src/roster_window.py:271 ../src/roster_window.py:329
-#: ../src/roster_window.py:368 ../src/roster_window.py:451
-#: ../src/roster_window.py:483 ../src/roster_window.py:485
-#: ../src/roster_window.py:3896 ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267 ../src/common/helpers.py:43
-msgid "Transports"
-msgstr "Транспорти"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:106
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Стаи за разговор"
 
-#: ../src/disco.py:419
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:500
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:640
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:641
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3617,205 +7077,466 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:645 ../src/disco.py:926
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:646
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:726
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Невалидно потребителско име"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %s от акаунт „%s“"
 
-#: ../src/disco.py:765
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:927
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1141 ../src/disco.py:1256
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Изпълнение на команда..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1293
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканиране на %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1474
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1481
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1488
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1711
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Записан"
 
-#: ../src/disco.py:1737
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Няма"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:1743
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:1749
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Мениджър на историята"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Изпратено съобщение"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Идентификатор"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP шифриране"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "В_ходящо съобщение:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Общи"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Функционалности на сървърите"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Файл:"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Време"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Напредък"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Вие"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получател: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Грешка: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Файловият трансфер е преустановен от отсрещната страна"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Описание: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:747
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:749
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Вече съществува файл с това име и нямате права да го презапишете."
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:753
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:753
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Какво искате да направите?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:763
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:764
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Запазване на файла като..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3823,65 +7544,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s не е валидно ниво за дневник"
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:186
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim изисква GTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3890,22 +7611,22 @@ msgstr ""
 "Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
 "стабилна от %s"
 
-#: ../src/gajim.py:139
+#: ../src/gajim.py:199
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
 "libglade."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim изисква PySQLite2"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim изисква pywin32"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3914,11 +7635,11 @@ msgstr ""
 "Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:296
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim вече е стартиран"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3926,172 +7647,392 @@ msgstr ""
 "Изглежда вече е стартирана друга инстанция на Gajim\n"
 "Продължаване въпреки това?"
 
-#: ../src/gajim.py:403
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Необходима е парола"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Въведете парола за GPG ключ за акаунт „%s“."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Грешна парола"
 
-#: ../src/gajim.py:404
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Желаният от вас псевдоним се използва или е регистриран от друг участник.\n"
+"Укажете друг псевдоним по-долу:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gajim.py:450 ../src/notify.py:435
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Приемате ли това запитване?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/gajim.py:767
-#, python-format
-msgid "Subject: %s"
-msgstr "Тема: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:812 ../src/gajim.py:825
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %s ( %s )"
 
-#: ../src/gajim.py:858
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:859
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:867
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:868
-msgid "You will always see him or her as offline."
-msgstr "Винаги ще го виждате като изключен."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:911
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: ../src/gajim.py:912 ../src/common/connection.py:417
-msgid "Check your connection or try again later."
-msgstr "Проверете връзката или опитайте отново по-късно."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s вече е познат като %s"
 
-#: ../src/gajim.py:1061 ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s вече е %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s вече е %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1064 ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s сега е %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1161
-msgid "Your passphrase is incorrect"
-msgstr "Паролата е грешна"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
 
-#: ../src/gajim.py:1162
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Необходима е парола за влизане в тази стая."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:1265
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Паролата е грешна"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1267
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Имате %d ново писмо"
 msgstr[1] "Имате %d нови писма"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1276
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"От: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gajim.py:1497
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1501
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1518
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gajim.py:1631
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "На _всяко съобщение"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: ../src/gajim.py:1632
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Конфликт с имената на потребители"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Свързване"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
+"продължите?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "Да _не се задава този въпрос отново"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Шифрирането е изключено"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Не може да влезете в стая, докато сте невидими."
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1972
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:2170
-msgid "Network Manager support not available"
-msgstr "Няма поддръжка за NetworkManager"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Отметката вече е установена"
 
-#: ../src/gajim.py:2249
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Отметката беше добавена успешно"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Може да организирате отметките чрез менюто „Действия“."
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Показва помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -4099,50 +8040,50 @@ msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "състояние"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "съобщение"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4151,21 +8092,21 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:128
 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 "
@@ -4175,28 +8116,30 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "OpenPGP ключ"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141
 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 "
@@ -4206,128 +8149,137 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID на контакта, който ще получи съобщението"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
 "акаунт)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отваря прозореца „Започване на разговор“"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Започване на разговор, като се използва този акаунт"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4335,35 +8287,72 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработка на адрес тип xmpp://"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "адрес"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Влизане в стая"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "стая"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Стая:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "псевдоним"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Псевдонимът не е намерен: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "парола"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Паролите не съвпадат"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Проверете дали е стартиран avahi-daemon."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Показва или скрива списъка"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4372,29 +8361,31 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Употреба: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4403,151 +8394,200 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:438
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%s help %s“ за повече информация"
 
-#: ../src/gajim-remote.py:442
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Не е указан аргумент „%s“.\n"
 "Напишете „%s help %s“ за повече информация"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Грешен адрес"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тема"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Не може да изтриете текущата тема"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "име на тема"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Не може да изтриете текущата тема"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Личен разговор"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Лични разговори"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:144
-msgid "Group Chat"
-msgstr "Стая"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Стаи"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "История на разговорите"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Свързване"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Новият акаунт беше създаден успешно"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:1142
 #, 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:840
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Връзка:"
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s вече е познат като %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: ../src/groupchat_control.py:1063 ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174 ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Невалидно потребителско име"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Тази стая няма тема"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117 ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "„%s“ изглежда не е валиден JID"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
-"say)"
-
-#: ../src/groupchat_control.py:1251
-#, python-format
-msgid "Commands: %s"
-msgstr "Команди: %s"
-
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4559,7 +8599,7 @@ msgstr ""
 "Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4568,12 +8608,7 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "участник."
 
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Употреба: /%s, изчиства текстовия прозорец."
-
-#: ../src/groupchat_control.py:1266
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4582,12 +8617,7 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_control.py:1269
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Употреба: /%s, скрива бутоните за разговор."
-
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4596,7 +8626,7 @@ msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4605,7 +8635,7 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4616,16 +8646,7 @@ msgstr ""
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_control.py:1285
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
-"трето лице (т.е. „/%s експлодира“)."
-
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4634,22 +8655,22 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Употреба: /%s, показва имената на участниците в стаята."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Употреба: /%s [тема], показва или актуализира текущата тема на стаята."
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4657,172 +8678,162 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_control.py:1308
-#, python-format
-msgid "No help info for /%s"
-msgstr "Няма помощна информация за /%s"
-
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1361
+#: ../src/groupchat_control.py:1839
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1365 ../src/roster_window.py:4036
-msgid "Do _not ask me again"
-msgstr "Да _не се задава този въпрос отново"
-
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
-#: ../src/groupchat_control.py:1435
-msgid "Bookmark already set"
-msgstr "Отметката вече е установена"
-
-#: ../src/groupchat_control.py:1436
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Стаята „%s“ вече присъства в отметките."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Описание: %s"
 
-#: ../src/groupchat_control.py:1445
-msgid "Bookmark has been added successfully"
-msgstr "Отметката беше добавена успешно"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1446
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Може да организирате отметките чрез менюто „Действия“."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1575 ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Беше открита програмна грешка"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 "Вероятно не е фатална, но би трябвало да се докладва на разработчиците."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Докладване на грешка"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Подробности"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:359
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:376
+#: ../src/gtkgui_helpers.py:396
 #, 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:691
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не е стандартния Джабър клиент"
 
-#: ../src/gtkgui_helpers.py:692
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Искате ли Gajim да бъде стандартния Джабър клиент?"
 
-#: ../src/gtkgui_helpers.py:693
+#: ../src/gtkgui_helpers.py:735
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Винаги да се проверява дали Gajim е стандартния Джабър клиент при всяко "
 "стартиране"
 
-#: ../src/gtkgui_helpers.py:792
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: ../src/gtkgui_helpers.py:793
+#: ../src/gtkgui_helpers.py:805
 #, 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:802
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Запазване на изображението като..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4830,7 +8841,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА АКО GAJIM Е "
 "СТАРТИРАН)"
 
-#: ../src/history_manager.py:189
+#: ../src/history_manager.py:226
 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 "
@@ -4844,214 +8855,264 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:199
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s вече е %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Неуспех при зареждането на изображението"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Разговори"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Стаи"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Лични разговори"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Съобщения"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:197
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ново лично съобщение от стая „%s“"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Ново съобщение от %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Общи"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Извличане на профила..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:210
-#: ../src/profile_window.py:219
-msgid "Click to set your avatar"
-msgstr "Натиснете, за да настроите аватара си"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Път до файл"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Такава стая не съществува."
 
 #. keep identation
-#: ../src/profile_window.py:137
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Получена информация"
 
-#: ../src/profile_window.py:314
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Изпращане на профила..."
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Информацията НЕ Е публикувана"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/profile_window.py:349
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:171 ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:344 ../src/common/helpers.py:43
-msgid "Observers"
-msgstr "Наблюдатели"
-
-#: ../src/roster_window.py:692 ../src/roster_window.py:3201
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Не може да влезете в стая, докато сте невидими."
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Упълномощаването беше изпратено"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "от акаунт „%s“"
+msgid "Now \"%s\" will know your status."
+msgstr "„%s“ вече ще знае състоянието ви."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "към акаунт „%s“"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Искането за записване беше изпратено"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "за акаунт „%s“"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Упълномощаването беше прекратено"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "за акаунт „%s“"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Управление на отметките..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
+"променливата на обкръжението не е настроена)"
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "за акаунт „%s“"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Мениджър на историята"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:1068
-msgid "_Join New Group Chat"
-msgstr "_Влизане в нова стая"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
+"сте, че искате да станете „Невидим“?"
+
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1398 ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
+"историята."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:1403
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5059,130 +9120,66 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:1411
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:1517
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:1782 ../src/roster_window.py:2043
-msgid "_New group chat"
-msgstr "_Нова стая"
-
-#: ../src/roster_window.py:1913
-msgid "I would like to add you to my roster"
-msgstr ""
-"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
-"roster."
-
-#: ../src/roster_window.py:2088 ../src/roster_window.py:2135
-msgid "Send Group M_essage"
-msgstr "_Изпращане на групово съобщение"
-
-#: ../src/roster_window.py:2114
-msgid "Re_name"
-msgstr "Пре_именуване"
-
-#: ../src/roster_window.py:2141
-msgid "To all users"
-msgstr "До всички потребители"
-
-#: ../src/roster_window.py:2144
-msgid "To all online users"
-msgstr "До всички включени потребители"
-
-#: ../src/roster_window.py:2180
-msgid "_Log on"
-msgstr "_Включване"
-
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "Изкл_ючване"
-
-#: ../src/roster_window.py:2312 ../src/roster_window.py:2383
-msgid "_Change Status Message"
-msgstr "Пром_яна на съобщението за състояние"
-
-#: ../src/roster_window.py:2455
-msgid "Authorization has been sent"
-msgstr "Упълномощаването беше изпратено"
-
-#: ../src/roster_window.py:2456
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "„%s“ вече ще знае състоянието ви."
-
-#: ../src/roster_window.py:2476
-msgid "Subscription request has been sent"
-msgstr "Искането за записване беше изпратено"
-
-#: ../src/roster_window.py:2477
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
-
-#: ../src/roster_window.py:2489
-msgid "Authorization has been removed"
-msgstr "Упълномощаването беше прекратено"
-
-#: ../src/roster_window.py:2490
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "„%s“ винаги ще ви вижда като изключен."
-
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:2684
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5190,7 +9187,13 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:2689
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Какво искате да направите?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5198,16 +9201,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:2692
+#: ../src/roster_window.py:3144
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2696
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:2700
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5216,97 +9219,36 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:2732
-msgid ""
-"Gnomekeyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-msgstr ""
-"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
-"променливата на обкръжението не е настроена)"
-
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2760 ../src/common/connection.py:671
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
-
-#: ../src/roster_window.py:2777
-msgid "Passphrase Required"
-msgstr "Необходима е парола"
-
-#: ../src/roster_window.py:2778
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Въведете парола за GPG ключ за акаунт „%s“."
-
-#: ../src/roster_window.py:2783
-msgid "Save passphrase"
-msgstr "Запазване на паролата"
-
-#: ../src/roster_window.py:2791
-msgid "Wrong Passphrase"
-msgstr "Грешна парола"
-
-#: ../src/roster_window.py:2792
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
-
-#: ../src/roster_window.py:2849 ../src/roster_window.py:2909
-msgid "You are participating in one or more group chats"
-msgstr "Участвате в една или повече стаи"
-
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2910
-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:2867
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:2868
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:2966
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "„%(title)s“ от %(artist)s"
-
-#: ../src/roster_window.py:3395 ../src/roster_window.py:3402
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
-"историята."
-
-#: ../src/roster_window.py:3986
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:3988
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:4030
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:4032
+#: ../src/roster_window.py:3786
 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 "
@@ -5316,110 +9258,322 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:4199
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Невалиден файл"
+
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
+msgid "Do you want to send this file to %s:"
+msgid_plural "Do you want to send these files to %s:"
+msgstr[0] "%s иска да ви изпрати файл:"
+msgstr[1] "%s иска да ви изпрати файл:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "от акаунт „%s“"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "към акаунт „%s“"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "за акаунт „%s“"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Управление на отметките..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Преместване на %s в група %s"
+msgid "of account %s"
+msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4206
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Създаване на %s и %s като мета-контакти"
+msgid "for account %s"
+msgstr "за акаунт „%s“"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "Пром_яна на съобщението за състояние"
+
+#: ../src/roster_window.py:4865
+msgid "Publish Tune"
+msgstr ""
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Активен"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Откриване на услуги..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
 
-#: ../src/roster_window.py:4393
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "_Изпращане на групово съобщение"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "До всички потребители"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "До всички включени потребители"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr ""
+"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
+"roster."
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Преименуване на контакт"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Изпращане на еднократно съобщение"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Транспорти"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Показване на т_ранспорти"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Изключване на контакт"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Нова стая"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Мениджър на историята"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Влизане в нова стая"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Тема: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:232
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s на тази стая"
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Последно състояние: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " от %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Свързване"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Изключване на контакт"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Стая:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Активирана"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Тип:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Временно прекъснат"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5427,24 +9581,25 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Връзка:"
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Програми</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5452,7 +9607,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5460,13 +9615,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:291
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5474,1465 +9629,443 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " ресурс с приоритет "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "създаване на база от данни за разговорите"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is a file but it should be a directory"
-msgstr "%s e файл, а би трябвало да е папка"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Спиране на програмата"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is a directory but should be a file"
-msgstr "%s e папка, а би трябвало да е файл"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "създаване на папка %s"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Промяна на информацията за състоянието"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Промяна на състоянието"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Настройване на съобщението за състояние и описанието му"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Свободен за разговор"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "На линия"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Не съм на разположение"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Не ме притеснявайте"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Изключен - изключване"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Описание на състоянието:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Състоянието беше променено."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s от стая %(room_jid)s"
-
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Не сте влезли в стая."
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Излизане от стаите"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Изберете стаите, които искате да напуснете"
-
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Стаи"
-
-#: ../src/common/commands.py:230
-msgid "You leaved the following groupchats:"
-msgstr "Излязохте от следните стаи:"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Използване на DBus и Notification-Daemon за показване на уведомленията"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Автоматично състояние поради липса на активност"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr ""
-"Време в минути, след което състоянието да се променя на „Не съм на "
-"разположение“."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Автоматично състояние поради липса на активност"
-
-#: ../src/common/config.py:83
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-"Списък (разделен с интервали) на редове (акаунти и групи), които да се "
-"свиват автоматично."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-"Активиране на съобщения от/за локални потребители (link-local/zeroconf)"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Език, който да се използва за проверката на правописа"
-
-#: ../src/common/config.py:92
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"„always“ - изписване на часа при всяко съобщение.\n"
-"„sometimes“ - изписване на часа през интервал, указан в "
-"„print_ichat_every_foo_minutes“.\n"
-"„never“ - никога да не се изписва часа."
-
-#: ../src/common/config.py:93
-msgid ""
-"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"Изписване на часа при разговорите чрез „Относителен часовник“. Стойността на "
-"относителността е от 1 до 4, или 0 за премахването на относителния часовник. "
-"1 е най-прецизния часовник, 4 е най-относителния. Това е в сила само ако "
-"опцията „print_time“ е настроена на „sometimes“."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
-
-#: ../src/common/config.py:97
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
-"символите * *."
-
-#: ../src/common/config.py:100
-msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-"Ако е избрана, използва реструктуриран текст за изпращане на HTML и "
-"форматиране в ASCII, ако е указано. За синтаксиса, вижте http://docutils."
-"sourceforge.net/docs/ref/rst/restructuredtext.html (Ако искате да използвате "
-"това, инсталирайте docutils)"
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Знак за добавяне след името на псевдонима при използване на автоматично "
-"допълване (TAB) в стая."
-
-#: ../src/common/config.py:110
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
-"той вече е използван от някой в стаята."
-
-#: ../src/common/config.py:133
-msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr ""
-"Чрез тази опция може да персонализирате начина на изписване на времето в "
-"разговор. Например „[%H:%M] “ ще показва „час:минути] “. Вижте "
-"документацията на Питон относно „strftime“ за повече информация: http://docs."
-"python.org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Знаци, които се изобразяват в разговори след псевдонима"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Добавяне на * и [n] към заглавието на списъка?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Колко реда от предишния разговор да за запомнят при повторното отваряне на "
-"подпрозорец/прозорец."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Колко минути да отделят последните редове от предишния разговор."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
-"„WIKTIONARY“, което означава използване на wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
-"remote."
-
-#: ../src/common/config.py:154
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"Ако е „True“, слуша за сигнали по DBus от NetworkManager и променя "
-"състоянието на акаунтите (при положение, че нямат настроена "
-"„listen_to_network_manager“ на „False“ и се синхронизират с общото "
-"състояние) в зависимост от състоянието на мрежовата връзка."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
-"„composing_only“, „disabled“."
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Показвани уведомления за състоянието на разговора в прозорците за разговор. "
-"Може да бъде „all“, „composing_only“, „disabled“."
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
-"„sometimes“), да се показва на всеки x минути."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
-"списък с адреси на стаи."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
-"списък с адреси на стаи."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
-"пренасочване на портове."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Уведомяване за събития в областта за уведомяване."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Показване на подпрозорец при един разговор?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Показване на бутона за затваряне на подпрозореца?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Списък с думи, отделени с точка и запетая, които ще се осветяват при "
-"разговор в стая."
-
-#: ../src/common/config.py:190
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"Ако е „True“, се спира програмата при натискане на бутона „X“ на "
-"администратора на прозорци. Тази настройка е валидна само ако се използва "
-"иконата в областта за уведомяване."
-
-#: ../src/common/config.py:191
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Ако е „True“, Gajim ще проверява дали е стандартния Джабър клиент при всяко "
-"стартиране."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
-"непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
-"всеки контакт под името му списъка."
-
-#: ../src/common/config.py:195
-msgid ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-msgstr ""
-"Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
-"нямал такъв последния път или пък има остарял кеширан аватар."
-
-#: ../src/common/config.py:196
-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:197
-msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
-"group chat."
-msgstr ""
-"Може да бъде „none“, „all“ или „in_and_out“. Ако е „none“, няма да се "
-"изписват състоянията в стаите, когато някой член сменя съобщението си за "
-"състояние или влиза/излиза в стаята. Ако е „all“, ще се изписват всички "
-"съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
-"в стаята“ или „Сульо напусна“."
-
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr "Цвят на фона на контактите, които се включват."
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr "Цвят на фона на контактите, които се изключват."
-
-#: ../src/common/config.py:202
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-"Ако е „True“, ще се използва по-малък шрифт от стандартния за възстановените "
-"съобщения."
-
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Да не се показва аватара на транспорта."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Да не се показва списъка в панела."
-
-#: ../src/common/config.py:205
-msgid ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
-msgstr ""
-"Ако е „True“ и инсталираните версии на GTK+ и PyGTK са поне 2.8, прозорецът "
-"ще мига (стандартното поведение при повечето мениджъри на прозорци) при "
-"задържане на чакащи събития."
-
-#: ../src/common/config.py:207
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"Jabberd1.4 не харесва информация от тип SHA при включване в стая, защитена с "
-"пароли. Настройте тази опция на „False“, за да спрете да изпращате "
-"информация от тип SHA при присъствие в стаи."
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Контролира прозореца, където се отварят нови съобщения.\n"
-"„always“ - Всички съобщения се отварят в един прозорец.\n"
-"„never“ - Всички съобщения се отварят в собствен прозорец.\n"
-"„peracct“ - Съобщенията за всеки акаунт се отварят в специфичен прозорец.\n"
-"„pertype“ - Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
-"специфичен прозорец. Забележете, че промяната на тази опция изисква "
-"рестартирането на Gajim, за да влезе в сила."
-
-#: ../src/common/config.py:211
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Ако е „False“, повече няма да виждате аватар в прозореца за разговор."
-
-#: ../src/common/config.py:212
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr ""
-"Ако е „True“, натискането на клавиша „Escape“ затваря прозореца/подпрозореца."
-
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "Скрива бутоните в прозореца на стаята."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Скрива бутоните в прозорец за разговор с два контакта."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Скрива лентата в прозорец за разговор с два контакта"
-
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Скрива списъка на участниците в прозореца на стаята."
-
-#: ../src/common/config.py:218
-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:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"Списък с цветове, които да се използват за оцветяване на псевдонимите в "
-"стаите."
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
-
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
-"контакти? Празен низ означава никога да не се показва диалогов прозорец."
-
-#: ../src/common/config.py:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"Ако е „True“, ще може да настроите отрицателен приоритет за акаунта в "
-"прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
-"отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
-
-#: ../src/common/config.py:224
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Ако е „True“, Gajim ще използва набора на ключове на GNOME (gnome-keyring), "
-"ако е достъпен, за да запазва информация за паролите на акаунтите."
-
-#: ../src/common/config.py:225
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Ако е „True“, Gajim ще показва броя на включените контакти и общия брой в "
-"редовете за акаунти и групи."
-
-#: ../src/common/config.py:226
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-msgstr ""
-"Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
-"съобщения се третират като от указания тип."
-
-#: ../src/common/config.py:237
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
-"Приоритетите се настройват в опциите „autopriority_*“."
-
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Заобикалка заради Jabberd2"
-
-#: ../src/common/config.py:270
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
-"посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
-
-#: ../src/common/config.py:329
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Активиран ли е OpenPGP за този контакт?"
-
-#: ../src/common/config.py:330 ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr "Език, за който желаете да се проверяват сгрешените думи."
-
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr "„all“ или състояния, разделени с интервал"
-
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "„yes“, „no“ или „both“"
-
-#: ../src/common/config.py:341 ../src/common/config.py:343
-#: ../src/common/config.py:344 ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "„yes“, „no“ или „“"
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Спя"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Връщам се скоро"
-
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Ще се върна след малко."
-
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Хапвам"
-
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Хапвам, така че ми оставете съобщение."
-
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Филм"
-
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Гледам филм."
-
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Работя"
-
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Работя."
-
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Телефон"
-
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Говоря по телефона."
-
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Навън"
-
-#: ../src/common/config.py:360
-msgid "I'm out enjoying life."
-msgstr "Наслаждавам се на живота навън."
-
-#: ../src/common/config.py:364
-msgid "I'm available."
-msgstr "На линия съм."
-
-#: ../src/common/config.py:365
-msgid "I'm free for chat."
-msgstr "Свободен за разговор."
-
-#: ../src/common/config.py:367
-msgid "I'm not available."
-msgstr "Не съм на разположение."
-
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Не ме притеснявайте."
-
-#: ../src/common/config.py:369 ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Довиждане!"
-
-#: ../src/common/config.py:379
-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_higlighted_words“ или когато съобщение съдържа псевдонима ви."
-
-#: ../src/common/config.py:380
-msgid "Sound to play when any MUC message arrives."
-msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
-
-#: ../src/common/config.py:389 ../src/common/optparser.py:193
-msgid "green"
-msgstr "зелена"
-
-#: ../src/common/config.py:393 ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "колониална"
-
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "хуманна"
-
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "морска"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Неуспех при зареждането на модула „idle“"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Грешен хост"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Хостът, който сте конфигурирали в опцията „ft_override_host_to_send“ не е "
-"валиден, така че се пренебрегва."
-
-#: ../src/common/connection_handlers.py:590
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
-
-#: ../src/common/connection_handlers.py:1543
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Псевдонимът не е позволен: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1620
-#: ../src/common/connection_handlers.py:1628
-msgid "Unable to join group chat"
-msgstr "Неуспех при влизането в стаята"
-
-#: ../src/common/connection_handlers.py:1606
-msgid "A password is required to join this group chat."
-msgstr "Необходима е парола за влизане в тази стая."
-
-#: ../src/common/connection_handlers.py:1609
-msgid "You are banned from this group chat."
-msgstr "Вие сте отлъчени от тази стая."
-
-#: ../src/common/connection_handlers.py:1612
-msgid "Such group chat does not exist."
-msgstr "Такава стая не съществува."
-
-#: ../src/common/connection_handlers.py:1615
-msgid "Group chat creation is restricted."
-msgstr "Създаването на стаи е ограничено."
-
-#: ../src/common/connection_handlers.py:1618
-msgid "Your registered nickname must be used."
-msgstr "Трябва да се използва регистрирания ви псевдоним."
-
-#: ../src/common/connection_handlers.py:1621
-msgid "You are not in the members list."
-msgstr "Не сте в списъка с членове."
-
-#: ../src/common/connection_handlers.py:1629
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Желаният от вас псевдоним се използва или е регистриран от друг участник.\n"
-"Укажете друг псевдоним по-долу:"
-
-#: ../src/common/connection_handlers.py:1679
-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:1700
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "вече сме записани за %s"
-
-#: ../src/common/connection_handlers.py:1702
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "искане за отписване от %s"
-
-#: ../src/common/connection_handlers.py:1704
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "вече сме отписани от %s"
-
-#: ../src/common/connection_handlers.py:1874
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s не е съгласно стандарта по RFC. Няма да бъде добавен към списъка. "
-"Използвайте инструменти за управление на списък като http://jru.jabberstudio."
-"org/, за да го премахнете."
-
-#: ../src/common/connection.py:182
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Връзката на акаунт „%s“ се разпадна"
-
-#: ../src/common/connection.py:183
-msgid "Reconnect manually."
-msgstr "Свържете се наново."
-
-#: ../src/common/connection.py:194 ../src/common/connection.py:221
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Транспортът „%s“ отговори погрешно на запитването за регистрация: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:220
-msgid "Invalid answer"
-msgstr "Невалиден отговор"
-
-#: ../src/common/connection.py:416 ../src/common/connection.py:515
-#: ../src/common/connection.py:973
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Не може да се осъществи свързване с „%s“"
-
-#: ../src/common/connection.py:430
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Свързан към сървър %s:%s с %s"
-
-#: ../src/common/connection.py:444
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Грешка в сигурността при свързването с „%s“"
-
-#: ../src/common/connection.py:445
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr ""
-"Ключът на сървъра е променен, или някой се опитва да взломи връзката ви."
-
-#: ../src/common/connection.py:452
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr ""
-"Неуспех при проверката на отпечатъка на %s. Свързването може да е несигурно."
-
-#: ../src/common/connection.py:494
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Липсва отпечатък при свързването чрез SSL с %s"
-
-#: ../src/common/connection.py:500
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Отпечатъкът на %s не съвпада; получи се %s, а се очакваше %s"
-
-#: ../src/common/connection.py:516
-msgid "Check your connection or try again later"
-msgstr "Проверете връзката или опитайте отново по-късно"
-
-#: ../src/common/connection.py:542
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Неуспех при удостоверяването с „%s“"
-
-#: ../src/common/connection.py:543
-msgid "Please check your login and password for correctness."
-msgstr "Проверете дали името и паролата са правилни."
-
-#: ../src/common/connection.py:570
-msgid "Error while removing privacy list"
-msgstr "Грешка при премахването на списъка за уединение"
-
-#: ../src/common/connection.py:571
-#, python-format
-msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Desactivate it and try again."
-msgstr ""
-"Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
-"свързаните ви ресурси. Изключете го и опитайте отново."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:669
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Не беше зададена парола за OpenPGP"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:711
-msgid "invisible"
-msgstr "невидим"
-
-#: ../src/common/connection.py:712
-msgid "offline"
-msgstr "изключен"
-
-#: ../src/common/connection.py:713
-#, python-format
-msgid "I'm %s"
-msgstr "%s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:804
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr ""
-"[Това съобщение е *шифрирано* (вижте JEP:„27“)]\n"
-"[This message is *encrypted* (See: JEP:`27')]"
-
-#: ../src/common/connection.py:860
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Тема: %s\n"
-"%s"
-
-#: ../src/common/connection.py:999
-msgid "Not fetched because of invisible status"
-msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
-
-#: ../src/common/contacts.py:271
-msgid "Not in roster"
-msgstr "Не е в списъка"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Възможностите за D-Bus не могат да бъдат използвани"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
-"Спиране на програмата..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Услугата не е налична: Gajim не е стартиран или „remote_control“ е „False“"
-
-#: ../src/common/exceptions.py:38
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
-
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Липсва „session bus“.\n"
-"Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "един"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "два"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "три"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "четири"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "пет"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "шест"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "седем"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "осем"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " ресурс с приоритет "
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "девет"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP шифриране"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "десет"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "единадесет"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Няма такава команда: /%s (ако искате да изпратите това, сложете "
+#~ "представка /say)"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "дванадесет"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
+#~ "трето лице (т.е. „/%s експлодира“)."
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 часа"
+#~ msgid "Encryption enabled"
+#~ msgstr "Шифрирането е включено"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 и пет"
+#~ msgid "Encryption disabled"
+#~ msgstr "Шифрирането е изключено"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 и десет"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Въведете паролата отново:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Използване на сървър-посредник"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 и петнадесет"
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Ако тази опция е избрана, всички локални контакти, които използват "
+#~ "клиент, съвместим с Bonjour (като iChat, Trillian или Gaim), ще бъдат "
+#~ "показани в списъка.  Не е необходимо да сте свързани към Джабър сървър.\n"
+#~ "Това е достъпно само при инсталиран „python-avahi“ и работещ „avahi-"
+#~ "daemon“."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Ако имате два или повече акаунта и тази опция е избрана, Gajim ще "
+#~ "изобразява всички контакти като от един акаунт."
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr ""
+#~ "_Активиране на съобщения от/за локални контакти (link-local messaging)"
+
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "13-12-2003T18:30:02Z"
+
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Ромео и Жулиета</small>"
+
+#~ msgid "Old stories"
+#~ msgstr "Стари записи"
+
+#~ msgid "Soliloquy"
+#~ msgstr "Монолог"
+
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Натиснете, за да видите стари разговори с този контакт"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Компактен изглед (Alt+C)"
+
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Натиснете, за да видите стари разговори в тази стая"
+
+#~ msgid "Build custom query"
+#~ msgstr "Потребителска заявка"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Изготвяне на заявки..."
+
+#~ msgid "Accept"
+#~ msgstr "Приемане"
+
+#~ msgid "Invitation Received"
+#~ msgstr "Получена покана"
+
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Формат на реда</b>"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Персонализиране на интерфейса</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Познато и като стил „iChat“"
+
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Например, ако сте активирали съобщението за състояние за „Отсъствам“, "
+#~ "Gajim няма да ви пита повече за съобщението за състояние, когато го "
+#~ "променяте; ще използва стандартното съобщение, настроено тук."
+
+#~ msgid "Chat"
+#~ msgstr "Разговор"
+
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "определени от изпращача\n"
+#~ "разговор\n"
+#~ "лично съобщение"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Всеки 5 _минути"
+
+#~ msgid "Events"
+#~ msgstr "Събития"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Автоматично ще се показват нови събития с изскачане на съответния прозорец"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Ще се появяват съобщения за уведомяване чрез изскачащ прозорец в долния "
+#~ "десен ъгъл на екрана"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
+#~ "включване на контакти"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Само ще се променя иконата на контакта, от който идва новото събитие"
+
+#~ 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 ""
+#~ "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка "
+#~ "и прозореца за разговор на екрана за следващото стартиране на програмата."
+
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Никога\n"
+#~ "Винаги\n"
+#~ "Според акаунта\n"
+#~ "Според типа"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 и двадесет"
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "_Изпращани уведомления при разговор:"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 и двадесет и пет"
+#~ msgid "Print time:"
+#~ msgstr "Изписване на часа:"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 и половина"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ 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 "Автоматично съобщение за състояние при „Отсъствам“"
+
+#~ msgid "The auto not available status message"
+#~ msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
+
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Третиране на всички входящи съобщения като:"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Икона в областта за уведомяване"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Когато се получи ново събитие (съобщение, запитване за файлов трансфер и "
+#~ "т.н.), могат да се използват следните методи за уведомяване. Забележете, "
+#~ "че събития за нови съобщения възникват само ако са нови съобщения от "
+#~ "контакт, с който не говорите в момента."
+
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Работи с Rhythmbox и Muine. За повече програми, посетете http://trac."
+#~ "gajim.org/wiki/GajimAndMusicPlayer."
+
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Контрол на уведомления за напреднали..."
+
+#~ msgid "_Font:"
+#~ msgstr "_Шрифт:"
+
+#~ msgid "_Never"
+#~ msgstr "_Никога"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "_Уведомяване"
+
+#~ msgid "_Player:"
+#~ msgstr "Пле_йър:"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Показване"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$1 без двадесет и пет"
+#~ msgid "_URL:"
+#~ msgstr "_Адрес:"
+
+#~ msgid "Address"
+#~ msgstr "Адрес"
+
+#~ msgid "City:"
+#~ msgstr "Град:"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "$1 без двадесет"
+#~ msgid "Company:"
+#~ msgstr "Фирма:"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "$1 без петнадесет"
+#~ msgid "Country:"
+#~ msgstr "Държава:"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "$1 без десет"
+#~ msgid "Given:"
+#~ msgstr "Собствено:"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "$1 без пет"
+#~ msgid "Middle:"
+#~ msgstr "Бащино:"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 часа"
+#~ msgid "Position:"
+#~ msgstr "Длъжност:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Нощ"
+#~ msgid "Prefix:"
+#~ msgstr "Обръщение:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Рано сутрин"
+#~ msgid "Role:"
+#~ msgstr "Роля:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Сутрин"
+#~ msgid "State:"
+#~ msgstr "Щат:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Почти обед"
+#~ msgid "Suffix:"
+#~ msgstr "Наставка:"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Обед"
+#~ msgid "_Remove from Roster"
+#~ msgstr "П_ремахване от списъка"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Следобед"
+#~ msgid "A_ccounts"
+#~ msgstr "А_каунти"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Вечер"
+#~ msgid "_Filter:"
+#~ msgstr "_Филтър:"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Късно вечер"
+#~ msgid "Ask:"
+#~ msgstr "Питане за:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Началото на седмицата"
+#~ msgid "Client:"
+#~ msgstr "Клиент:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Средата на седмицата"
+#~ msgid "OS:"
+#~ msgstr "ОС:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Края на седмицата"
+#~ msgid "Subscription:"
+#~ msgstr "Записване:"
 
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Събота и неделя!"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Ако това не е езикът, за който искате осветяване на неправилно изписаните "
+#~ "думи, настройте променливата $LANG. За български език напишете „export "
+#~ "LANG=bg_BG“ или „export LANG=bg_BG.UTF-8“ в ~/.bash_profile или за "
+#~ "системна настройка в /etc/profile.\n"
+#~ "\n"
+#~ "Осветяването на неправилно изписаните думи няма да се използва"
 
-#: ../src/common/helpers.py:114
-msgid "Invalid character in username."
-msgstr "Невалиден символ в потребителското име."
+#~ msgid "Every %s _minutes"
+#~ msgstr "Всеки %s _минути"
 
-#: ../src/common/helpers.py:119
-msgid "Server address required."
-msgstr "Необходим е адрес на сървъра."
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/common/helpers.py:124
-msgid "Invalid character in hostname."
-msgstr "Невалиден символ в името на хоста."
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/common/helpers.py:130
-msgid "Invalid character in resource."
-msgstr "Невалиден символ в ресурса."
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s вече е %s (%s)"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:170
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "%s is now %s"
+#~ msgstr "%s сега е %s"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:173
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "От: %(from_address)s"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:177
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Няма поддръжка за NetworkManager"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:180
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:184
-#, python-format
-msgid "%s KiB"
-msgstr "%s KB"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Употреба: %s %s %s \n"
+#~ "\t %s"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:187
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "Private Chat"
+#~ msgstr "Личен разговор"
 
-#. B means bytes
-#: ../src/common/helpers.py:190
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "Group Chat"
+#~ msgstr "Стая"
 
-#: ../src/common/helpers.py:219
-msgid "_Busy"
-msgstr "_Зает"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "„%s“ изглежда не е валиден JID"
 
-#: ../src/common/helpers.py:221
-msgid "Busy"
-msgstr "Зает"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/helpers.py:224
-msgid "_Not Available"
-msgstr "_Не съм на разположение"
+#~ msgid "_New group chat"
+#~ msgstr "_Нова стая"
 
-#: ../src/common/helpers.py:229
-msgid "_Free for Chat"
-msgstr "_Свободен за разговор"
+#~ msgid "_Log on"
+#~ msgstr "_Включване"
 
-#: ../src/common/helpers.py:231
-msgid "Free for Chat"
-msgstr "Свободен за разговор"
+#~ msgid "Log _off"
+#~ msgstr "Изкл_ючване"
 
-#: ../src/common/helpers.py:234
-msgid "_Available"
-msgstr "На _линия"
+#~ msgid "Save passphrase"
+#~ msgstr "Запазване на паролата"
 
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "На линия"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Преместване на %s в група %s"
 
-#: ../src/common/helpers.py:238
-msgid "Connecting"
-msgstr "Свързване"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Създаване на %s и %s като мета-контакти"
 
-#: ../src/common/helpers.py:241
-msgid "A_way"
-msgstr "_Отсъствам"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Скрива бутоните в прозорец за разговор с два контакта."
 
-#: ../src/common/helpers.py:246
-msgid "_Offline"
-msgstr "_Изключен"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Свързан към сървър %s:%s с %s"
 
-#: ../src/common/helpers.py:248
-msgid "Offline"
-msgstr "Изключен"
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Грешка в сигурността при свързването с „%s“"
 
-#: ../src/common/helpers.py:251
-msgid "_Invisible"
-msgstr "Не_видим"
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "Ключът на сървъра е променен, или някой се опитва да взломи връзката ви."
 
-#: ../src/common/helpers.py:257
-msgid "?contact has status:Unknown"
-msgstr "Неизвестно"
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr ""
+#~ "Неуспех при проверката на отпечатъка на %s. Свързването може да е "
+#~ "несигурно."
 
-#: ../src/common/helpers.py:259
-msgid "?contact has status:Has errors"
-msgstr "Има грешки"
-
-#: ../src/common/helpers.py:264
-msgid "?Subscription we already have:None"
-msgstr "Няма"
-
-#: ../src/common/helpers.py:266
-msgid "To"
-msgstr "За"
-
-#: ../src/common/helpers.py:270
-msgid "Both"
-msgstr "Двустранно"
-
-#: ../src/common/helpers.py:278
-msgid "?Ask (for Subscription):None"
-msgstr "Няма"
-
-#: ../src/common/helpers.py:280
-msgid "Subscribe"
-msgstr "Записване"
-
-#: ../src/common/helpers.py:289
-msgid "?Group Chat Contact Role:None"
-msgstr "Не е установен"
-
-#: ../src/common/helpers.py:292
-msgid "Moderators"
-msgstr "Председатели"
-
-#: ../src/common/helpers.py:294
-msgid "Moderator"
-msgstr "Председател"
-
-#: ../src/common/helpers.py:297
-msgid "Participants"
-msgstr "Участници"
-
-#: ../src/common/helpers.py:299
-msgid "Participant"
-msgstr "Участник"
-
-#: ../src/common/helpers.py:302
-msgid "Visitors"
-msgstr "Посетители"
-
-#: ../src/common/helpers.py:304
-msgid "Visitor"
-msgstr "Посетител"
-
-#: ../src/common/helpers.py:310
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Няма"
-
-#: ../src/common/helpers.py:312
-msgid "Owner"
-msgstr "Собственик"
-
-#: ../src/common/helpers.py:314
-msgid "Administrator"
-msgstr "Администратор"
-
-#: ../src/common/helpers.py:316
-msgid "Member"
-msgstr "Член"
-
-#: ../src/common/helpers.py:355
-msgid "is paying attention to the conversation"
-msgstr "обръща внимание на разговора"
-
-#: ../src/common/helpers.py:357
-msgid "is doing something else"
-msgstr "прави нещо друго"
-
-#: ../src/common/helpers.py:359
-msgid "is composing a message..."
-msgstr "пише съобщение..."
-
-#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
-msgid "paused composing a message"
-msgstr "спря да пише съобщение"
-
-#: ../src/common/helpers.py:364
-msgid "has closed the chat window or tab"
-msgstr "затвори прозореца или подпрозореца"
-
-#: ../src/common/helpers.py:890
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] " %d непрочетено съобщение"
-msgstr[1] " %d непрочетени съобщения"
-
-#: ../src/common/helpers.py:896
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] " %d непрочетено еднократно съобщение"
-msgstr[1] " %d непрочетени еднократни съобщения"
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Липсва отпечатък при свързването чрез SSL с %s"
 
-#: ../src/common/helpers.py:902
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] " %d непрочетено съобщение в стая"
-msgstr[1] " %d непрочетени съобщения в стаи"
-
-#: ../src/common/helpers.py:908
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] " %d непрочетено лично съобщение"
-msgstr[1] " %d непрочетени лични съобщения"
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Отпечатъкът на %s не съвпада; получи се %s, а се очакваше %s"
 
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "invisible"
+#~ msgstr "невидим"
 
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "грешка: %s не може да бъде отворен за четене"
+#~ msgid "offline"
+#~ msgstr "изключен"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "GTK+"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] " %d непрочетено еднократно съобщение"
+#~ msgstr[1] " %d непрочетени еднократни съобщения"
 
-#: ../src/common/optparser.py:188 ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "синьозелена"
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] " %d непрочетено съобщение в стая"
+#~ msgstr[1] " %d непрочетени съобщения в стаи"
 
-#: ../src/common/optparser.py:306
-msgid "migrating logs database to indices"
-msgstr "мигриране на базата от данни с дневници към индекси"
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] " %d непрочетено лично съобщение"
+#~ msgstr[1] " %d непрочетени лични съобщения"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Акаунт „%s“"
+#~ msgid "gtk+"
+#~ msgstr "GTK+"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"Неуспех при установяването на връзка с хоста: Неправилен отговор от сървъра."
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Неуспех при установяването на връзка с хоста: Неправилен отговор от "
+#~ "сървъра."
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Неуспех при установяването на връзка с хоста"
-
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Неуспех при установяването на връзка с хоста: Изтичане на допустимото време "
-"при изпращането на данните."
-
-#: ../src/common/zeroconf/client_zeroconf.py:627
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"За да продължите да изпращате и получавате съобщения, трябва да се свържете "
-"наново."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Грешка в Avahi"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Изпращането и получаването на съобщения тип „link-local“ може и да не "
-"функционира правилно."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Проверете дали Avahi е инсталиран."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Неуспех при стартирането на локална услуга"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Неуспех при свързването с порт %d."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Проверете дали е стартиран avahi-daemon."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Не сте свързани и не сте видими за другите. Съобщението ви не можа да бъде "
-"изпратено."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Това съобщение е шифрирано]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Грешка при добавянето на услугата. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Неуспех при установяването на връзка с хоста"
diff --git a/po/br.po b/po/br.po
index 02ed15240..cb9007fb5 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,12 +7,11 @@
 # , 2005.
 #
 #
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -36,45 +35,54 @@ msgid "Jabber IM Client"
 msgstr "Flaperez Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Kas ur gemennadenn _simpl..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Dizoleiñ ar servijoù..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Webkaozioù"
-
-#: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
+#, fuzzy
+msgid "_Modify Account"
 msgstr "_Kemmañ ar gont..."
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:6
 #, 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -87,55 +95,81 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Kevreañ pa bouezan war Echuiñ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 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:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "_Ger-kuzh:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Kemmañ..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proksi:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Enrollañ ar _ger-kuzh"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #, fuzzy
 msgid "Servers Features"
 msgstr "Perzhioù ar servijerien"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Aozañ ma aelad pa lugan"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Implij un anv ostiz/porzh personelaet"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -143,67 +177,64 @@ msgstr ""
 "Rankout a rit kaout ur gont evit en em lugañ\n"
 "d'ar rouedad Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Ho JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Mont pelloc'h"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Echuiñ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Ostiz:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Servijer:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Ger-kuzh:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porzh:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Adroit ho ker-kuzh"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servijer:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Implij ur proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Anv:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 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/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Titouroù hiniennel</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Kont"
 
@@ -212,19 +243,29 @@ msgid "Account Modification"
 msgstr "Kemmañ ar gont"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Roll ar verourien"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "C_heñch ar ger-kuzh"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -236,44 +277,61 @@ msgstr ""
 "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:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Dibabit un _alc'hwezh..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klikit evit cheñch ger-kuzh ar gont"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Kevreadenn"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Kemmañ an titouroù hiniennel..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Hollek"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Servijer:"
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:23
 #, fuzzy
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
@@ -282,15 +340,17 @@ 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:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
 "Si cette case est cochée, Gajim enverra des paquets de maintien de connexion "
 "pour prévenir des temps de latence pouvant entraîner des déconnexions"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -299,7 +359,8 @@ 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:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -308,7 +369,8 @@ 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:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -318,63 +380,71 @@ 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:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Kemmañ..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Hini ebet"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porzh:"
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
 "client with the highest priority gets the events"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proksi:"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+msgid "Resour_ce:"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -383,87 +453,161 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "_Enrollañ ar ger-kuzh (diasur)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Implij un anv ostiz/porzh personelaet"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Implij ar proksioù evit treuzkas restroù"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "_Anv:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Perzhioù</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Kontoù"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Postel:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Enaouiñ"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, 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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ""
-"M'ho peus daou gont pe ouzhpenn hag eo diuzet, e vo strollet an holl "
-"zarempredoù evel pa vefe ur gont hepken"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "ID Jabber:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Anv:"
+
+#: ../data/glade/accounts_window.glade.h:35
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "_Strollañ ar c'hontoù"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "_Adenvel"
+
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Kemmañ"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Dilemel"
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
@@ -485,7 +629,7 @@ msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
 #: ../data/glade/add_new_contact_window.glade.h:5
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -524,7 +668,7 @@ msgstr "ID arveriad-ez:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
 #, fuzzy
-msgid "<b>An error has occured:</b>"
+msgid "<b>An error has occurred:</b>"
 msgstr "Une erreur de protocole s'est produite :"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -563,11 +707,13 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Taolennadur</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+#, 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"
 
@@ -588,46 +734,47 @@ msgid "Deletes Message of the Day"
 msgstr "A zilam kemennadenn an devezh"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "A gas ur gemennadenn d'an arveridi luget war ar servijer-mañ"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Flapoù prevez"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Lakaat MOTD"
+#, 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
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Lakaat MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "A laka kemennadenn an devezh"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Diskouez ar gonsol _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Hizivaat MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "A hiziva kemennadenn an devez"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Merour-ez"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr ""
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Kas ur gemennadenn simpl"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
@@ -643,7 +790,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonioù</b>"
 
@@ -663,7 +810,7 @@ msgid "All statuses"
 msgstr "Stad:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Ezvezant"
 
@@ -680,7 +827,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Diwelus"
 
@@ -690,7 +837,7 @@ msgid "Launch a command"
 msgstr "urzhiad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Dihegerz"
 
@@ -711,125 +858,136 @@ msgstr "_Seniñ"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.h:28
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.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:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 #, fuzzy
 msgid "for "
 msgstr "Porzh:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Entry:"
 msgstr "Bro:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "anv ar gwiskadur"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Anv:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Darempredoù"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Titouroù-stad raklakaet</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:9
-msgid "You have received new entry:"
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
 msgstr ""
 
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Titouroù-stad raklakaet</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Sonioù</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Cheñch ar ger-kuzh"
@@ -860,10 +1018,9 @@ msgid "Join _Group Chat"
 msgstr "Ebarzhiñ ur _webgaoz"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Ouzhpennañ er roll"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -883,39 +1040,69 @@ msgid "_Open Link in Browser"
 msgstr "_Digerién an ere er furcher web"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../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/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klikit amañ evit gwelout kaozioù kent gant an darempred-mañ"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Darempredoù"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Kas ur _restr"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+msgid "Toggle End to End Encryption"
+msgstr ""
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr ""
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr ""
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Ouzhpennañ er roll"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Istoradur"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Diwelus"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Sellerien"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -929,6 +1116,24 @@ msgstr "Kefluniañ ar webgaoz"
 msgid "Edit Groups"
 msgstr "Kemmañ ar strolladoù"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Taolennadur</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Perzhioù ar servijerien"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
@@ -962,11 +1167,13 @@ msgid "Remove file transfer from the list."
 msgstr "Dilemel an treuzkas restroù diwar ar roll"
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, 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
-msgid "Shows a list of file transfers between you and other"
+#, 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
@@ -981,7 +1188,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Kenderc'hel"
 
@@ -989,7 +1196,7 @@ msgstr "_Kenderc'hel"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Digeriñ ar renkell pal"
 
@@ -1038,7 +1245,7 @@ msgstr "Personelaat gwiskadurioù Gajim"
 msgid "Gone"
 msgstr "Aet kuit"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Dizoberiant"
 
@@ -1080,58 +1287,72 @@ msgid "_Background:"
 msgstr "_Drekleur:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Cheñch _lesanv"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Kemmañ ar _sujed"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klikit amañ evit gwelout kaozioù kent ar flap-mañ"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Ke_fluniañ ar flap"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Ke_fluniañ ar flap"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Ka_sour-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Galloudoù an darempred"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Merour-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Argas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Ermaeziañ"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Ezel"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Galloudoù an darempred"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Kas ur gemennadenn brevez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr ""
 
@@ -1139,103 +1360,104 @@ msgstr ""
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Digant"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Titl"
 
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Merour istoradur Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Dilemel"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Ezporzhiañ"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Merour istoradur Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Klask en titourva"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Krouiñ ur goulenn personelaet"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Istoradur ar gaoz"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Krouiñ ur goulenn..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Klask"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Klask"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Asantiñ"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Nac'hañ"
+#, fuzzy
+msgid "Search:"
+msgstr "Klask"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Resevet ar bedadenn"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Istoradur flapiñ"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Lesanv:"
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "Aozañ ma aelad pa lugan"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "Lesanv:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Ger-kuzh:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Nevez 'zo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -1255,19 +1477,38 @@ msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage
 msgid "Manage Bookmarks"
 msgstr "Merañ ar sinedoù"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 #, fuzzy
 msgid "Print status:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Servijer:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titl:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Kefluniañ ar webgaoz"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Perzhioù</b>"
@@ -1277,46 +1518,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Dibarzhioù</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Kevreadenn HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Merañ an aeladoù proksi"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Anv:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Ger-kuzh:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Doare:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Implij an diskleriañ"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Ostiz:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "Encryption OpenPGP"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Oberoù"
+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"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Kas"
 
@@ -1332,41 +1612,78 @@ msgstr "<b>Aozer kefluniañ munut</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Poelladoù</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Poelladoù</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Personelaet</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Furmad ul linenn</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Furmad ul linenn</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Liv-stad an ivinelloù</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
 #, fuzzy
-msgid "<b>GMail Options</b>"
-msgstr "<b>Poelladoù</b>"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Kelaouennoù dre welet</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Personelaat an etrefas</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Personelaet</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Sonioù</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+#, fuzzy
+msgid "<b>GMail Options</b>"
+msgstr "<b>Poelladoù</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<b>Perzhioù</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Titouroù-stad raklakaet</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Perzhioù</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Kelaouennoù dre welet</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
-msgid "A_fter nickname:"
-msgstr "Da _heul al lesanv:"
-
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Dre ar munut"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Dre ar munut"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1376,44 +1693,25 @@ msgstr ""
 "O skrivañ hepken\n"
 "Lazhet"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:25
 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:19
-msgid "Also known as iChat style"
-msgstr "Anvet ivez stil iChat"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Goulenn an titour-stad pa:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Détection automatique à chaque démarrage\n"
@@ -1421,67 +1719,56 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "B_efore nickname:"
-msgstr "_A-raok al lesanv:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Flap"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
-msgstr ""
-"Cochez cette option seulement si quelqu'un n'appartenant pas à votre liste "
-"vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
-"messages des contacts qui ne sont pas dans votre liste"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Configure color and font of the interface"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Titour-stad:"
 
 #: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
-msgid "Default Status Messages"
-msgstr "Titour-stad"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:34
-msgid "Default status _iconset:"
-msgstr "_Arlunioù-stad dre-ziouer:"
+msgid "Configure color and font of the interface"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:35
-msgid "Display _extra email details"
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:36
-msgid "Display a_vatars of contacts in roster"
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display status _messages of contacts in roster"
-msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
+#: ../data/glade/preferences_window.glade.h:41
+msgid "Display _extra email details"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:42
 #, fuzzy
-msgid "Displayed Chat state noti_fications:"
-msgstr "Titou_roù-stad ar flap:"
+msgid "Display _tunes of contacts in roster"
+msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:39
-msgid "E_very 5 minutes"
-msgstr "_Bep 5 munutenn"
+#: ../data/glade/preferences_window.glade.h:43
+msgid "Display a_vatars of contacts in roster"
+msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:40
-msgid "Emoticons:"
-msgstr "Boulomelloù:"
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Darvoudoù"
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Display status _messages of contacts in roster"
+msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1492,7 +1779,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:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1502,50 +1789,47 @@ 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:44
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
-"Gajim will automatically show new events by poping up the relative window"
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
-"Gajim montrera automatiquement les nouveaux évènements reçus en montrant la "
-"fenêtre correspondante"
+"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:45
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim vous signalera les nouveaux évènements dans une fenêtre en bas à "
-"droite de l'écran"
+#: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim vous signalera par une fenêtre de notification en bas à droite de "
-"l'écran qu'un contact s'est connecté"
+"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:47
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
 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:48
+#: ../data/glade/preferences_window.glade.h:53
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Gajim ne fera que changer l'icône du contact qui a envoyé le nouvel évènement"
+"Si cette case est cochée, Gajim placera une icône dans la zone de "
+"notification"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
+"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:51
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1553,7 +1837,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:52
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1561,15 +1845,62 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
+"fenêtre principale et les salons"
+
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 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"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Si cette case est cochée, Gajim va retenir la position de votre liste "
-"decontacts et des fenêtres de discussion pour vos prochaines utilisations"
+"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:54
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
+"fenêtre principale et les salons"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Cochez cette option seulement si quelqu'un n'appartenant pas à votre liste "
+"vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
+"messages des contacts qui ne sont pas dans votre liste"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:63
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1579,7 +1910,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:55
+#: ../data/glade/preferences_window.glade.h:65
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1587,222 +1924,213 @@ 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:56
-msgid "Ignore rich content in incoming messages"
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:68
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Ur prenestr-flapiñ:"
+
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/glade/preferences_window.glade.h:58
-msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
-msgstr ""
-"Morse\n"
-"Atav\n"
-"Dre gont\n"
-"Dre zoare"
+#: ../data/glade/preferences_window.glade.h:70
+#, fuzzy
+msgid "Notifications"
+msgstr "Kemmañ ar gont"
 
-#: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
+#: ../data/glade/preferences_window.glade.h:71
+#, 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:63
+#: ../data/glade/preferences_window.glade.h:72
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
+
+#: ../data/glade/preferences_window.glade.h:73
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "Da _bep kemennadenn:"
-
-#: ../data/glade/preferences_window.glade.h:65
-msgid "One message _window:"
-msgstr "Ur prenestr-flapiñ:"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Titou_roù-stad ar flap:"
+msgid "Personal Events"
+msgstr "Titouroù hiniennel"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "Penndibaboù"
-
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Diskouez an eur:"
-
-#: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr "_Mirout lec'hiadur ha ment ar roll hag ar prenistri-flapiñ"
-
-#: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Diskouez er _roll hepken"
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Penndibaboù"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:82
 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:76
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Urzhiañ an darempredoù hervez o stad"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/glade/preferences_window.glade.h:77
-msgid "T_heme:"
-msgstr "_Gwiskadur:"
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "An emc'hemennadenn evit ar stad \"Ezvezant\""
-
-#: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
-
-#: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
-msgstr "Implij arlunioù an _dorioù"
+#: ../data/glade/preferences_window.glade.h:85
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/glade/preferences_window.glade.h:81
-msgid "Use system _default"
+#: ../data/glade/preferences_window.glade.h:86
+msgid "Style"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Implij an arlun-gelaouiñ (trayicon)"
+#: ../data/glade/preferences_window.glade.h:87
+msgid "T_heme:"
+msgstr "_Gwiskadur:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
-"Pa resevit un darvoud nevez (kemennadenn, goulenn treuzkas h.a.), ez eus tu "
-"implij an doareoù da heul evit kelaouién ac'hanoc'h. Deoc'h da c'houzout, "
-"ec'h erru darvoudoù evit kemennadennoù nevez m'int bet kaset gant un "
-"darempred n'emaoc'h ket o flapién gant-añ/-i."
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
-msgstr "Pa resever un darvoud nevez"
-
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
-msgid "_Advanced Notifications Control..."
-msgstr "Aozer kefluniañ dre ar munut"
+msgid "Use _transports icons"
+msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/glade/preferences_window.glade.h:87
-msgid "_After time:"
-msgstr "_War-lerc'h an eur:"
+#: ../data/glade/preferences_window.glade.h:91
+msgid "Use system _default"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:88
-msgid "_Before time:"
-msgstr "_A-raok an eur:"
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
+
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:95
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Titou_roù-stad ar flap:"
+
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Boulomelloù:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/glade/preferences_window.glade.h:91
-msgid "_Font:"
-msgstr "_Nodrezh:"
-
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:99
 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:94
+#: ../data/glade/preferences_window.glade.h:100
+msgid "_Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Morse"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Kelaouiñ ac'hanon"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "Kemennadenn o _vont 'maez:"
 
-#: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "_Soner:"
-
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "Di_foupañ"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/glade/preferences_window.glade.h:104
-msgid "_Sort contacts by status"
-msgstr "_Urzhiañ an darempredoù hervez o stad"
+#: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
-msgstr "_URL :"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Ebarzhiñ ur _webgaoz"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Ket er roll"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "munutenn"
 
@@ -1841,6 +2169,10 @@ msgstr ""
 msgid "Allow"
 msgstr ""
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Nac'hañ"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
@@ -1851,7 +2183,7 @@ msgstr "ID Jabber:"
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
@@ -1893,154 +2225,181 @@ msgstr "Goulenn evit gwelet e/he stad"
 msgid "to view my status"
 msgstr "He/E aotren da welet ma stad"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Furmad ul linenn</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Diwar-benn"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Dibab ur _skeudenn"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Chomlec'h"
+#: ../data/glade/vcard_information_window.glade.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
 #, fuzzy
-msgid "Avatar:"
-msgstr "Dibab ur _skeudenn"
+msgid "<b>City:</b>"
+msgstr "<b>Personelaet</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Deiz-ha-bloaz:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Kêr:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Embregerezh:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Bro:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Departamant:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "Postel:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Chomlec'h 2:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Familh:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Stumm : BBBB-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Personelaet</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Anv bihan:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Lec'hienn hiniennel:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Furmad ul linenn</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Personelaet</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Lesanv:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Eil anv bihan:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Pellgomz:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Muioc'h"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Sonioù</b>"
 
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, 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:31
+#: ../data/glade/vcard_information_window.glade.h:27
 #, fuzzy
-msgid "Personal Info"
-msgstr "Titouroù hiniennel"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Perzhioù</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Pellgomz:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Dibarzhioù</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Plas:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Kod postel:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Dibarzhioù</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Rakger:"
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Perzh:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Diwar-benn"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Stad:"
+msgid "Click to set your avatar"
+msgstr ""
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Straed:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Stumm : BBBB-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Lostger:"
+#: ../data/glade/vcard_information_window.glade.h:47
+#, fuzzy
+msgid "Personal Info"
+msgstr "Titouroù hiniennel"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Labour"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Embann"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Kargañ"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Petra 'fell deoc'h ober ?</b>"
@@ -2053,81 +2412,131 @@ msgstr "Dilemel ar gont diwar Gajim _hepken"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Dilemel"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "A_sk to see his/her status"
 msgstr "Goulenn evit gwelet e/he stad"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Ouzhpennañ ur gelaouenn _ispisial"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr ""
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Assigner une clé OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Kemmañ ar _strolladoù"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr ""
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Kas ur gemennadenn _simpl"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Dilemel"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Goulenn evit gwelet e/he stad"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Kas ur gemennadenn _simpl..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Kas ur _restr"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Kregiñ da _flapiñ"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Difenn dezhañ/dezhi gwelet ma stad"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Dilemel diouzh ar roll"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Darempredoù"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Adenvel"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Koumanant"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Kenderc'hel"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Kontoù"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Ouzhpennañ un darempred..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Ouzhpennañ un _darempred"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Perzhioù ar servijerien"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2141,53 +2550,93 @@ msgstr "Marc'had Ar Goulennoù (FAQ enlinenn)"
 msgid "Help online"
 msgstr "Skoazell enlinenn"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Aelad, Avatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Dorioù"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Diskouez ar _roll-darempredoù"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Endalc'hadoù"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoù"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Dizoleiñ ar servijoù"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Oberoù"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Endalc'hadoù"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Skoazell"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Penndibaboù"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Kuitaat"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Kas ur gemennadenn _simpl..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr ""
 
+#: ../data/glade/search_window.glade.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
+msgid "Search"
+msgstr "Klask"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Ouzhpennañ un _darempred"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Titouroù"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Klask"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Mont"
@@ -2196,10 +2645,6 @@ msgstr "_Mont"
 msgid "_Address:"
 msgstr "_Chomlec'h:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Sil:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "En em enrollañ war"
@@ -2258,11 +2703,15 @@ msgid "Au_thorize"
 msgstr "_Aotren"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, 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
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, fuzzy
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr ""
 "Nac'hañ aotre an darempred evit ma ne welo ket hag eñ oc'h kevreet pe get"
 
@@ -2274,11 +2723,32 @@ msgstr "Goulenn koumanantiñ"
 msgid "_Deny"
 msgstr "_Nac'hañ"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
@@ -2291,59 +2761,75 @@ msgstr "Diskouez ar _roll-darempredoù"
 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:5
-msgid "Ask:"
-msgstr "Goulenn:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Poelladoù</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Poellad:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "ID Jabber:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Une erreur de protocole s'est produite :"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Dibarzhioù</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Taolennadur</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Personelaet</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 #, fuzzy
 msgid "Comments"
 msgstr "Evezhiadenn: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Ke_fluniañ ar flap"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Darempredoù"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Titouroù"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "ID Jabber:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr ""
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Stad:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Koumanant:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Muioc'h"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Istoradur flapiñ"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Choisissez un Avatar"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2353,11 +2839,6 @@ msgstr ""
 msgid "<b>XML Input</b>"
 msgstr ""
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Enaouiñ"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2376,17 +2857,29 @@ msgstr "_Kemennadenn"
 msgid "_Presence"
 msgstr "_Bezañs"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-#, fuzzy
-msgid "First Name:"
-msgstr "Anv:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Ouzhpennañ ur gelaouenn _ispisial"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-#, fuzzy
-msgid "Last Name:"
-msgstr "Anv:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr ""
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Kemmañ ar _strolladoù"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Adenvel"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Kemmañ ar gont..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2397,211 +2890,416 @@ msgstr ""
 msgid "Personal"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
 msgstr ""
 
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Stad:"
+
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 #, fuzzy
 msgid "Modify Account"
 msgstr "_Kemmañ ar gont..."
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
+#: ../src/adhoc_commands.py:264
 #, fuzzy
-msgid "Use custom port:"
-msgstr "Implij un anv ostiz/porzh personelaet"
+msgid "Cancel confirmation"
+msgstr "Titouroù"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "Oberiant"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "Dizoberiant"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "Er strollad"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr "Texte"
+
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
 
-#: ../src/advanced.py:57
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Dibab"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Talvoud"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Doare"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Hini ebet)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+msgid "Belarusian"
+msgstr ""
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "German"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Greek"
 msgstr "Glas"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+msgid "British"
+msgstr ""
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Croatian"
 msgstr "Chomlec'h"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Italian"
 msgstr "Stouet"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Polish"
 msgstr "_Embann"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Hollek"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:844
-msgid "Chats"
-msgstr "Flapoù"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "War enaou emañ ar sifrañ"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Ket er roll"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
 
-#: ../src/chat_control.py:1030
+#: ../src/chat_control.py:1314
+#, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+
+#: ../src/chat_control.py:1438
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Lazhet eo ar sifrañ"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Implij an diskleriañ"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Implij an diskleriañ"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
 msgstr ""
-"N'eus bet kaset alc'hwezh OpenPGP ebet gant %s, ha n'o peus roet hini ebet "
-"dezhañ"
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "War enaou emañ ar sifrañ"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Urzhioù: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Usage : /%s, nettoie la fenêtre."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
+"personne. (ex : /%s explose.)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Usage: /%s, cache les boutons de discussion."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "N'eus skoazell hegerz ebet evit /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "Ket er roll"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#: ../src/chat_control.py:1854
+#, 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:1545
+#: ../src/chat_control.py:2225
 #, 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:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2609,102 +3307,2669 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s a zo bremañ %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "o krouiñ titourva an istoradur"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Emañ Gajim o vont da guitaat diouzhtu"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "a grou ar renkell %s"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Titouroù"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Darempred diluget"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Prest da flapiñ"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "_Kenderc'hel"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr ""
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Taolennadur"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Flap a-stroll"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s : %(message)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "Er strollad"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Flapoù a-stroll"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Emaoc'h er webgaoz %s dija"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "Gajim - %d gemennadenn nevez"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr ""
+"Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-kelaouiñ"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Ezvezant rak dizoberiant"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Dihegerz rak dizoberiant."
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Dilemel"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
+"* *."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
+"ivinell pe ur prenestr."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"E-pad pet munutenn e rank linennoù diwezhañ ar gaozeadenn kent bezañ "
+"gwarezet."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
+"ziouer ar poellad ICQ Mirabilis)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
+"hag a dalvez implij wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
+
+#: ../src/common/config.py:186
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
+"mañ."
+
+#: ../src/common/config.py:187
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
+"esaouenn er roll-mañ."
+
+#: ../src/common/config.py:190
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Hervez ar standard IEC, KiB = 1024 byte, KB = 1000 byte."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Noti_fications d'état de discussion"
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+
+#: ../src/common/config.py:219
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+
+#: ../src/common/config.py:222
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
+"chaque contact dans la fenêtre principale et les salons"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+
+#: ../src/common/config.py:229
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr ""
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+
+#: ../src/common/config.py:240
+#, fuzzy
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 n'aime pas l'information sha quand on rejoint un salon protégé "
+"par un mot de passe. Passer cette option a Faux pour ne plus envoyer "
+"l'information sha dans les présences des salons"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"A reolia ar prenestr a vez lakaet ar c'hemennadennoù nevez enni.\n"
+"'always' - An holl gaozioù en hevelep prenestr.\n"
+"'never' - An holl gaozioù e prenestroù disheñvel.\n"
+"'peracct' - An holl gaozioù en ur prenestr hervez ar gont.\n"
+"'pertype' - Bep a brenestr gant ur stumm flapiñ (webgaoz/flap)."
+
+#: ../src/common/config.py:244
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
+
+#: ../src/common/config.py:245
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+"M'eo gwir, klikit war an douchenn Echap evit serriñ un ivinell/prenestr"
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "A guzha an nozelennoù er prenestroù webgaoz"
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr ""
+
+#: ../src/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
+
+#: ../src/common/config.py:253
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "O kousket"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Distro 'benn nebeut"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Distro 'vin a-benn un nebeut munutennoù.."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "O tebriñ"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "O sellout ouzh ur film 'maon."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "O labourat"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "O labourat 'maon."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Pellgomz"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Ouzh ar pellgomz emaon."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Er-maez"
+
+#: ../src/common/config.py:421
+#, fuzzy
+msgid "I'm out enjoying life."
+msgstr "Er-maez emaon o profitañ eus ar vuhez"
+
+#: ../src/common/config.py:425
+#, fuzzy
+msgid "I'm available."
+msgstr "Hegerz"
+
+#: ../src/common/config.py:426
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Prest da flapiñ"
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Distro a-benn nebeut."
+
+#: ../src/common/config.py:428
+#, fuzzy
+msgid "I'm not available."
+msgstr "Dihegerz"
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:441
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr ""
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "Glas"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr ""
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "Mab-den"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "Glas-mor"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy
+msgid "Wrong host"
+msgstr "Ger-kuzh faos"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
+"temps"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+msgid "Invisibility not supported"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Vous êtes banni de ce salon."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Ce salon n'existe pas."
+
+#: ../src/common/connection_handlers.py:2060
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "La création de salon est réservée aux administrateurs."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Vous n'êtes pas dans la liste des membres."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Dilamet eo bet an aotre"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "nous sommes maintenant inscrits chez %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Requête de désinscription de la part de %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "nous ne sommes plus dans la liste de %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
+"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
+"jru.jabberstudio.org/ pour le supprimer"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Luget e voc'h da %s hep OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr ""
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Aozadur D-Bus dianav: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Respont direizh"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Kevreadenn"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Dibosupl eo en em lugañ da \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Dibosupl eo en em lugañ da \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Aozadur D-Bus dianav: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "C'hwitet an diskleriadenn gant \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "fazi en ur gas %s ( %s )"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Titl : %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Sellerien"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Dorioù"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "Ket er roll"
+
+# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr ""
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "N'hell ket anv ar gont chom goullo."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Dihegerz eo bus an estez.\n"
+"Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Hini ebet"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "piv"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Straed:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Porzh:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "restr"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Darvoud"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Kenderc'hel"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Dilemel"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "Emezelañ war %s"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "Emezelañ war %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "Emezelañ war %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "Emezelañ war %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "Emezelañ war %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "Emezelañ war %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+#, fuzzy
+msgid "Morning"
+msgstr "O labourat"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Noon"
+msgstr "Hini ebet"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Evening"
+msgstr "Darvoud"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Arouezenn ziereizh en anv-arveriad-ez"
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Chomlec'h ar servijer dre ret"
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Arouezenn zireizh en anv-ostiz."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr ""
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s Go"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s Go"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s Mo"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s Mo"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s Ko"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s Ko"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s o"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr ""
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr ""
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "D_ihegerz"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Prest da flapiñ"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Prest da flapiñ"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Hegerz"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Hegerz"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "O lugañ"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "E_zvezant"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Ezlinenn"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Ezlinenn"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Diwelus"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Dianav"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "fazi"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Hini ebet"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Da"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "An daou"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Hini ebet"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Emezelañ"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Hini ebet"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Kasourien"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Kasour-ez"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Perzhidi"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Perzhiad-ez"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Gweladennerien"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Gweladenner-ez"
+
+#: ../src/common/helpers.py:358
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Hini ebet"
+
+#: ../src/common/helpers.py:360
+#, fuzzy
+msgid "Owner"
+msgstr "_Perc'hener-ez"
+
+#: ../src/common/helpers.py:362
+#, fuzzy
+msgid "Administrator"
+msgstr "_Merour-ez"
+
+#: ../src/common/helpers.py:364
+#, fuzzy
+msgid "Member"
+msgstr "_Ezel"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "a zo aketus d'ar gaozeadenn"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "a ra un dra bennak all"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "a skriv ur gemennadenn..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "a zo paouezet da skrivañ ar gemennadenn"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Kas ur gemennadenn"
+msgstr[1] "Kas ur gemennadenn"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "Cyan"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "o krouiñ titourva an istoradur"
+
+#: ../src/common/passwords.py:92
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "eus ar gont %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Ehan"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Tev"
+
+#: ../src/common/pep.py:38
+msgid "Brave"
+msgstr ""
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Flapoù"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Tev"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Endalc'hadoù"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Echu"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Endalc'hadoù"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:221
+#: ../src/common/pep.py:49
+msgid "Curious"
+msgstr ""
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Dilemel"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Dizoberiant"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Dizoberiant"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Dizoberiant"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Strollad"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Ostiz:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "kemennadenn"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Diwelus"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "Hini ebet"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Ostiz:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Hollek"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Kemmañ"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Ezlinenn"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Strollad"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "Dilemel"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+msgid "Sad"
+msgstr ""
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Anv:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Lesanv"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "O kousket"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Straed:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Emezelañ"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Mare"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Islinennañ"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Ger-kuzh faos"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Darvoud"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "O skrivañ"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "Er strollad"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Darvoud"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Skarzhañ %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "E_barzhiñ"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "O tebriñ"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Cheñch ar sujed"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Skarzhañ %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "O tebriñ"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "Standard"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Skarzhañ %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "O tebriñ"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Dilugañ"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "O tebriñ"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Abeg"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Abeg"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "O kousket"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "O tebriñ"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "O sellout ouzh ur film 'maon."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "O tebriñ"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Ouzh ar pellgomz emaon."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "O treuzkas"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "O skrivañ"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+msgid "On a Train"
+msgstr ""
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "O labourat"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "O skrivañ"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "O labourat"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, fuzzy, python-format
+msgid "Unable to bind to port %s."
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Bep %s _munutenn"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/config.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Dibosupl eo en em lugañ da \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "fazi en ur gas %s ( %s )"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Dizoberiant"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Titour-stad"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Enaouiñ"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personelaet</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, 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:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:1074
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Kemennadenn da-heul"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Anv"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Adlugañ bremañ?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Darvoudoù chomet dilenn"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
+
+#: ../src/config.py:1693
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "N'ho peus kont bev ebet"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 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:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr "Darvoudoù chomet dilenn"
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 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:1344
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2712,173 +5977,147 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Merañ ar c'hontoù"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 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:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr "Distro a-benn nebeut."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr "Adlugañ bremañ?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
 
-#: ../src/config.py:1566
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Dibab un alc'hwezh OpenPGP"
+
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 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:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 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:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 #, 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:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
-
-#: ../src/config.py:1634 ../src/config.py:3427
-msgid "OpenPGP Key Selection"
-msgstr "Dibab un alc'hwezh OpenPGP"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Anv"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Servijer"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
-
-#: ../src/config.py:1969
-#, fuzzy, python-format
-msgid "You have opened chat in account %s"
-msgstr "N'ho peus kont bev ebet"
-
-#: ../src/config.py:1970
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr ""
-
-#: ../src/config.py:2029
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2886,11 +6125,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2898,23 +6137,24 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
+#, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2922,7 +6162,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2939,381 +6179,499 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Diskouez an eur:"
+
+#: ../src/config.py:2758
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2749
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
 "sined-mañ."
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "Ger-kuzh direizh"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "Ne glot ket ar gerioù-kuzh"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-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."
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Eilañ an ID Jabber"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 msgstr ""
 "Bez e c'hellit aozañ dibaboù araoket ar gont en ur pouezañ war an nozelenn "
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3100
-msgid "Your new account has been created successfully"
-msgstr "Gant berzh eo bet krouet ho kont nevez!"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Darempred er roll dija"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Gant berzh eo bet krouet ho kont nevez!"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 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:342
+#: ../src/conversation_textview.py:678
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, 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:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Dec'h"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Flaperez Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Lakaat MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Titour-stad"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
+"marplij."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Leuniit titouroù an darempred a zo da vezañ ouzhpennet er gont %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:906
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossible de rejoindre le salon"
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, 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:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 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:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 #, 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:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Servijer"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Luget eo ar gont \"%s\" d'ar servijer"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3323,277 +6681,384 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Ger-kuzh direizh"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Ne glot ket ar gerioù-kuzh"
+
+#: ../src/dialogs.py:2025
+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:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1887
+#: ../src/dialogs.py:2628
 #, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2633
 #, fuzzy, python-format
-msgid "Order: %s, action: %s"
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 #, 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."
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Vous êtes banni de ce salon."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, fuzzy, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+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"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Traoù all"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Dorioù"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 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:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3601,207 +7066,469 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 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:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/disco.py:754
+#, 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:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "urzhiad"
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1295
+#: ../src/disco.py:1390
 #, python-format
-msgid "Scanning %d / %d.."
+msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Hini ebet"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP : "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Merour an istoradur"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Kemennadenn gaset"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+msgid "Idle"
+msgstr ""
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Encryption OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Kemennadenn o _tegouezhout:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Hollek"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Perzhioù ar servijerien"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Restr"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Mare"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Araokadur"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "C'hwi"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Echu eo an treuzkas"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "Nullet eo bet an treuzkas"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "Arsavet eo bet an treuzkas gant ho tarempred"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Dibabit ur restr da gas..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Taolennadur: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Implijet eo ar restr-mañ gant ur poellad all."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Restr: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Doare: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Enrollañ ar restr dindan..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3809,62 +7536,72 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Restr direizh"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Restr:"
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Ehan"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, 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:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3873,21 +7610,21 @@ msgstr ""
 "Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
 "diwezhañ diwar %s"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3895,225 +7632,454 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Aotre HTTP (%s) evit %s (id : %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Ger-kuzh ret"
+
+#: ../src/gajim.py:494
+#, 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."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Ger-kuzh faos"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
+"par un autre occupant.\n"
+"Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Degemer a rit ar goulenn-mañ?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Aotre HTTP (%s) evit %s (id : %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gajim.py:706
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Sujed: %s\n"
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s : %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "Atav e weloc'h anezhañ ezlinenn."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s a zo bremañ %s"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s a zo bremañ %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "Direizh eo ho ker-kuzh"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Un mot de passe est requis pour rejoindre ce salon."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Direizh eo ho ker-kuzh"
+
+#: ../src/gajim.py:1561
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Da _bep kemennadenn:"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+msgid "Resource Conflict"
+msgstr ""
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Kevreadenn"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Chom hep goulenn ket"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Lazhet eo ar sifrañ"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gajim.py:2090
-#, fuzzy
-msgid "Network Manager support not available"
-msgstr "N'eus ket tu da gevreañ"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Sined lakaet dija"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
+#: ../src/gajim.py:2998
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Gant berzh eo bet ouzhpennet ar sined"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
-"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
+"Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim-remote.py:79
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "diskouez ar skoazell evit un urzhiad resis"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "urzhiad"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 #, fuzzy
-msgid "Popups a window with the next pending event"
+msgid "Pops up a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "stad"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "kemennadenn"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "titour stad"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4121,21 +8087,21 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "A ziskouez ar prenestr flapiñ evit ma c'hellfec'h kas ur gemennadenn d'un "
 "darempred"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4146,27 +8112,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "alc'hwezh pgp"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -4177,142 +8145,216 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID an darempred hag a resevo ar gemennadenn"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "m'eo resisaet, e vo kaset ar rest en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'alc'hwezh' eo anv an dibab, 'talvoud' eo an talvoud da lakaat dezhañ"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "touchenn"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
 "bennak)"
 
-#: ../src/gajim-remote.py:214
-msgid "Returns number of unreaded messages"
+#: ../src/gajim-remote.py:238
+#, fuzzy
+msgid "Returns number of unread messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr ""
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:249
-msgid "Missing argument \"contact_jid\""
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
 msgstr ""
 
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Ebarzhiñ ur webgaoz nevez"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "Digant"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Webgaoz:"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "Lesanv"
+
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "Ger-kuzh:"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Ne glot ket ar gerioù-kuzh"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+msgid "Check if Gajim is running"
+msgstr ""
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Diskouez pe kuzhat ar prenestr pennañ"
+
+#: ../src/gajim-remote.py:306
+msgid "Missing argument \"contact_jid\""
+msgstr ""
+
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4321,29 +8363,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:335
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Implij: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4352,143 +8396,198 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:498
+#, python-format
+msgid ""
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
+
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Ger-kuzh faos"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Gwiskadur"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "N'hellit ket dilemel ar gwiskadur red"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "anv ar gwiskadur"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "N'hellit ket dilemel ar gwiskadur red"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Flap prevez"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Flapoù prevez"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:152
 #, fuzzy, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+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:144
-msgid "Group Chat"
-msgstr "Flap a-stroll"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Flapoù a-stroll"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Istoradur ar gaoz"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Kevreadenn"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Gant berzh eo bet krouet ho kont nevez!"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, 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:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+msgid "affiliation changed"
+msgstr ""
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s a zo bremañ %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:936
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s a zo bremañ %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s ne seblant ket bezañ ur JID a-feson"
-
-#: ../src/groupchat_control.py:1227
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"N'eus ket eus an urzhiad: /%s (lakait /say araozañ ma fell deoc'h e gas)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Urzhioù: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4501,20 +8600,16 @@ msgstr ""
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1259
-#, python-format
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Usage : /%s, nettoie la fenêtre."
-
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4523,12 +8618,7 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_control.py:1268
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Usage: /%s, cache les boutons de discussion."
-
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4537,7 +8627,7 @@ msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4546,7 +8636,7 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4557,196 +8647,190 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1692
 #, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
-"personne. (ex : /%s explose.)"
-
-#: ../src/groupchat_control.py:1288
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
 "envoie le message à l'occupant(e) spécifié(e) par le surnom."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage : /%s <message>, envoie un message sans chercher d'autres commandes."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "N'eus skoazell hegerz ebet evit /%s"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, 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:1358
+#: ../src/groupchat_control.py:1839
 #, 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:1362 ../src/roster_window.py:3962
-msgid "Do _not ask me again"
-msgstr "_Chom hep goulenn ket"
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "Sined lakaet dija"
-
-#: ../src/groupchat_control.py:1433
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
+msgid "Destroying %s"
+msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "Gant berzh eo bet ouzhpennet ar sined"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-msgid "You can manage your bookmarks via Actions menu in your roster."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
 msgstr ""
-"Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Ur fazi gouleviñ (programmiñ) ez eus bet kavet"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Diskleriañ ar Bug"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Munudoù"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:334
+#: ../src/gtkgui_helpers.py:396
 #, 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."
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+msgid "Gajim is not the default Jabber client"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:734
+#, fuzzy
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Voulez-vous l'écraser ?"
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:738
+#: ../src/gtkgui_helpers.py:844
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Darempredoù"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Deiziad"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4754,7 +8838,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:188
+#: ../src/history_manager.py:226
 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 "
@@ -4763,141 +8847,177 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s a zo bremañ %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "L'image est trop grande"
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Flapoù"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Flapoù a-stroll"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Flapoù prevez"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Kemennadenn hiniennel nevez digant ar sal %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Kemennadenn nevez digant %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Hollek"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr ""
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Treug ar restr"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Ce salon n'existe pas."
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Rankout a rit bezaén luget evit embann ho titouroù hiniennel."
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr ""
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4905,225 +9025,159 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "Rankout a rit bezañ luget evit kaout titouroù an darempred."
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Sellerien"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-#, 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."
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Kaset eo bet an aotre"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "en ur implij ar gont %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
-#, python-format
-msgid "to %s account"
-msgstr "d'ar gont %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "en ur implij ar gont %s"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:983
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Dilamet eo bet an aotre"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "eus ar gont %s"
+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:1003
-#, fuzzy
-msgid "_Manage Bookmarks..."
-msgstr "Merañ ar sinedoù..."
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "evit ar gont %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1053
-msgid "History Manager"
-msgstr "Merour an istoradur"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+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:1062
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "Ebarzhiñ ur sal-flapiñ"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
+
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
+
+#: ../src/roster_window.py:2522
 #, 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:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:1393
+#: ../src/roster_window.py:2534
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, 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:1421
+#: ../src/roster_window.py:2676
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, 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:1476
+#: ../src/roster_window.py:2733
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:1478
+#: ../src/roster_window.py:2735
 #, fuzzy
-msgid "Remove also all contacts in this group from your roster"
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-#, fuzzy
-msgid "_New group chat"
-msgstr "Flap a-stroll"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-#, fuzzy
-msgid "Send Group M_essage"
-msgstr "_Kas ur gemennadenn d'ar servijer"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "_Adenvel"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr ""
-
-#: ../src/roster_window.py:2061
-#, fuzzy
-msgid "To all online users"
-msgstr "Utilisateurs En _Ligne"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "_Lugañ"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "_Dilugañ"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "_Kemmañ an titour-stad"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "Kaset eo bet an aotre"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "Kaset eo bet ar goulenn goumanantiñ"
-
-#: ../src/roster_window.py:2394
-#, 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:2406
-msgid "Authorization has been removed"
-msgstr "Dilamet eo bet an aotre"
-
-#: ../src/roster_window.py:2407
-#, 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:2615
+#: ../src/roster_window.py:3128
 #, 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:2619
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5131,7 +9185,13 @@ 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:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Petra a fell deoc'h ober?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5139,17 +9199,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:2627
+#: ../src/roster_window.py:3144
 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:2631
+#: ../src/roster_window.py:3148
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5158,195 +9218,357 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Luget e voc'h da %s hep OpenPGP."
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "Ger-kuzh ret"
-
-#: ../src/roster_window.py:2711
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Enrollañ ar ger-kuzh"
-
-#: ../src/roster_window.py:2724
-msgid "Wrong Passphrase"
-msgstr "Ger-kuzh faos"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-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:2783 ../src/roster_window.py:2843
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 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:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr ""
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3956
+#: ../src/roster_window.py:3784
 #, 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:3958
+#: ../src/roster_window.py:3786
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"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:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Restr direizh"
+
+#: ../src/roster_window.py:3910
+#, 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:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "en ur implij ar gont %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "d'ar gont %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "en ur implij ar gont %s"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+#, fuzzy
+msgid "_Manage Bookmarks..."
+msgstr "Merañ ar sinedoù..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Kas %s er strollad %s"
+msgid "of account %s"
+msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:4132
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Strollañ %s ha %s"
+msgid "for account %s"
+msgstr "evit ar gont %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Kemmañ an titour-stad"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Embann"
 
-#: ../src/roster_window.py:4319
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Oberiant"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Dizoleiñ ar servijoù..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "_Kas ur gemennadenn d'ar servijer"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:5055
+#, fuzzy
+msgid "To all online users"
+msgstr "Utilisateurs En _Ligne"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Darempredoù"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Kas ur gemennadenn simpl"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Dorioù"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Dorioù"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Darempred diluget"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Flap a-stroll"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Merour an istoradur"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Ebarzhiñ ur sal-flapiñ"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Sujed: %s\n"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID Jabber:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Stad:"
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "dibaoe %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Kevreadenn"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Darempred diluget"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Koumanant:"
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Webgaoz:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Oberiant"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Doare:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Echu"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 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:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5354,31 +9576,32 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr ""
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Poelladoù</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 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:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5386,1290 +9609,379 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 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:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr ""
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "o krouiñ titourva an istoradur"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Emañ Gajim o vont da guitaat diouzhtu"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "a grou ar renkell %s"
-
-#: ../src/common/config.py:55
-#, fuzzy
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr ""
-"Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-kelaouiñ"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "Ezvezant rak dizoberiant"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "Dihegerz rak dizoberiant."
-
-#: ../src/common/config.py:82
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr ""
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
-
-#: ../src/common/config.py:96
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
-"* *."
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
-"ivinell pe ur prenestr."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"E-pad pet munutenn e rank linennoù diwezhañ ar gaozeadenn kent bezañ "
-"gwarezet."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
-"ziouer ar poellad ICQ Mirabilis)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
-"hag a dalvez implij wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
-
-#: ../src/common/config.py:154
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
-
-#: ../src/common/config.py:160
-#, fuzzy
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
-"mañ."
-
-#: ../src/common/config.py:161
-#, fuzzy
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
-"esaouenn er roll-mañ."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Hervez ar standard IEC, KiB = 1024 byte, KB = 1000 byte."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr ""
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
-
-#: ../src/common/config.py:175
-#, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-
-#: ../src/common/config.py:190
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr ""
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-
-#: ../src/common/config.py:193
-#, fuzzy
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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:196
-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:197
-msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
-"group chat."
-msgstr ""
-
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr ""
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr ""
-
-#: ../src/common/config.py:202
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr ""
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr ""
-
-#: ../src/common/config.py:205
-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:207
-#, fuzzy
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"Jabberd1.4 n'aime pas l'information sha quand on rejoint un salon protégé "
-"par un mot de passe. Passer cette option a Faux pour ne plus envoyer "
-"l'information sha dans les présences des salons"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-#, fuzzy
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"A reolia ar prenestr a vez lakaet ar c'hemennadennoù nevez enni.\n"
-"'always' - An holl gaozioù en hevelep prenestr.\n"
-"'never' - An holl gaozioù e prenestroù disheñvel.\n"
-"'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:211
-#, 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:212
-#, 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:213
-#, fuzzy
-msgid "Hides the buttons in group chat window."
-msgstr "A guzha an nozelennoù er prenestroù webgaoz"
-
-#: ../src/common/config.py:214
-#, fuzzy
-msgid "Hides the buttons in two persons chat window."
-msgstr "A guzha an nozelennoù er prenestroù-flapiñ"
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "A guzha an nozelennoù er prenestr flapiñ"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr ""
-
-#: ../src/common/config.py:217
-#, 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:218
-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:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr ""
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/common/config.py:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
 msgstr ""
 
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Encryption OpenPGP"
 
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr ""
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "N'eus bet kaset alc'hwezh OpenPGP ebet gant %s, ha n'o peus roet hini "
+#~ "ebet dezhañ"
 
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "N'eus ket eus an urzhiad: /%s (lakait /say araozañ ma fell deoc'h e gas)"
 
-#: ../src/common/config.py:326
 #, fuzzy
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-msgid "Language for which we want to check misspelled words"
-msgstr ""
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la "
+#~ "troisième personne. (ex : /%s explose.)"
 
-#: ../src/common/config.py:336
-msgid "all or space separated status"
-msgstr ""
+#~ msgid "Encryption enabled"
+#~ msgstr "War enaou emañ ar sifrañ"
 
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr ""
+#~ msgid "Encryption disabled"
+#~ msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr ""
+#~ msgid "_Retype Password:"
+#~ msgstr "_Adroit ho ker-kuzh"
 
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "O kousket"
+#~ msgid "_Use proxy"
+#~ msgstr "_Implij ur proxy"
 
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "Distro 'benn nebeut"
-
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "Distro 'vin a-benn un nebeut munutennoù.."
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "M'ho peus daou gont pe ouzhpenn hag eo diuzet, e vo strollet an holl "
+#~ "zarempredoù evel pa vefe ur gont hepken"
 
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "O tebriñ"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klikit amañ evit gwelout kaozioù kent gant an darempred-mañ"
 
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klikit amañ evit gwelout kaozioù kent ar flap-mañ"
 
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "Film"
+#~ msgid "Build custom query"
+#~ msgstr "Krouiñ ur goulenn personelaet"
 
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "O sellout ouzh ur film 'maon."
+#~ msgid "Query Builder..."
+#~ msgstr "Krouiñ ur goulenn..."
 
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "O labourat"
+#~ msgid "Accept"
+#~ msgstr "Asantiñ"
 
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "O labourat 'maon."
+#~ msgid "Invitation Received"
+#~ msgstr "Resevet ar bedadenn"
 
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "Pellgomz"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "Ouzh ar pellgomz emaon."
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Personelaat an etrefas</b>"
 
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "Er-maez"
+#~ msgid "A_fter nickname:"
+#~ msgstr "Da _heul al lesanv:"
 
-#: ../src/common/config.py:357
-#, fuzzy
-msgid "I'm out enjoying life."
-msgstr "Er-maez emaon o profitañ eus ar vuhez"
+#~ msgid "Also known as iChat style"
+#~ msgstr "Anvet ivez stil iChat"
 
-#: ../src/common/config.py:361
-#, fuzzy
-msgid "I'm available."
-msgstr "Hegerz"
+#~ msgid "B_efore nickname:"
+#~ msgstr "_A-raok al lesanv:"
 
-#: ../src/common/config.py:362
-#, fuzzy
-msgid "I'm free for chat."
-msgstr "Prest da flapiñ"
+#~ msgid "Chat"
+#~ msgstr "Flap"
 
-#: ../src/common/config.py:364
-#, fuzzy
-msgid "I'm not available."
-msgstr "Dihegerz"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "_Bep 5 munutenn"
 
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr ""
+#~ msgid "Events"
+#~ msgstr "Darvoudoù"
 
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr ""
-
-#: ../src/common/config.py:376
-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 ""
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr ""
+#~ "Gajim montrera automatiquement les nouveaux évènements reçus en montrant "
+#~ "la fenêtre correspondante"
 
-#: ../src/common/config.py:377
-msgid "Sound to play when any MUC message arrives."
-msgstr ""
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim vous signalera les nouveaux évènements dans une fenêtre en bas à "
+#~ "droite de l'écran"
 
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "Glas"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim vous signalera par une fenêtre de notification en bas à droite de "
+#~ "l'écran qu'un contact s'est connecté"
 
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr ""
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim ne fera que changer l'icône du contact qui a envoyé le nouvel "
+#~ "évènement"
 
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "Mab-den"
+#~ 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 ""
+#~ "Si cette case est cochée, Gajim va retenir la position de votre liste "
+#~ "decontacts et des fenêtres de discussion pour vos prochaines utilisations"
 
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "Glas-mor"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Morse\n"
+#~ "Atav\n"
+#~ "Dre gont\n"
+#~ "Dre zoare"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossible de rejoindre le salon"
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Titou_roù-stad ar flap:"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-#, fuzzy
-msgid "Wrong host"
-msgstr "Ger-kuzh faos"
+#~ msgid "Print time:"
+#~ msgstr "Diskouez an eur:"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "_Mirout lec'hiadur ha ment ar roll hag ar prenistri-flapiñ"
 
-#: ../src/common/connection_handlers.py:590
-#, 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"
+#~ msgid "Show only in _roster"
+#~ msgstr "Diskouez er _roll hepken"
 
-#: ../src/common/connection_handlers.py:1523
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "N'eus ket bet kavet al lesanv : %s"
+#~ msgid "The auto away status message"
+#~ msgstr "An emc'hemennadenn evit ar stad \"Ezvezant\""
 
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
-#, fuzzy
-msgid "Unable to join group chat"
-msgstr "Impossible de rejoindre le salon"
+#~ msgid "The auto not available status message"
+#~ msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
 
-#: ../src/common/connection_handlers.py:1586
-#, fuzzy
-msgid "A password is required to join this group chat."
-msgstr "Un mot de passe est requis pour rejoindre ce salon."
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: ../src/common/connection_handlers.py:1589
-#, fuzzy
-msgid "You are banned from this group chat."
-msgstr "Vous êtes banni de ce salon."
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Pa resevit un darvoud nevez (kemennadenn, goulenn treuzkas h.a.), ez eus "
+#~ "tu implij an doareoù da heul evit kelaouién ac'hanoc'h. Deoc'h da "
+#~ "c'houzout, ec'h erru darvoudoù evit kemennadennoù nevez m'int bet kaset "
+#~ "gant un darempred n'emaoc'h ket o flapién gant-añ/-i."
 
-#: ../src/common/connection_handlers.py:1592
 #, fuzzy
-msgid "Such group chat does not exist."
-msgstr "Ce salon n'existe pas."
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Aozer kefluniañ dre ar munut"
 
-#: ../src/common/connection_handlers.py:1595
-#, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "La création de salon est réservée aux administrateurs."
+#~ msgid "_After time:"
+#~ msgstr "_War-lerc'h an eur:"
 
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+#~ msgid "_Before time:"
+#~ msgstr "_A-raok an eur:"
 
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "Vous n'êtes pas dans la liste des membres."
+#~ msgid "_Font:"
+#~ msgstr "_Nodrezh:"
 
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
-"par un autre occupant.\n"
-"Veuillez entrer un autre surnom ci-dessous :"
+#~ msgid "_Never"
+#~ msgstr "_Morse"
 
-#: ../src/common/connection_handlers.py:1659
-msgid "I would like to add you to my roster."
-msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+#~ msgid "_Notify me about it"
+#~ msgstr "_Kelaouiñ ac'hanon"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nous sommes maintenant inscrits chez %s"
+#~ msgid "_Player:"
+#~ msgstr "_Soner:"
 
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Requête de désinscription de la part de %s"
+#~ msgid "_Pop it up"
+#~ msgstr "Di_foupañ"
 
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nous ne sommes plus dans la liste de %s"
+#~ msgid "_URL:"
+#~ msgstr "_URL :"
 
-#: ../src/common/connection_handlers.py:1854
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
-"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
-"jru.jabberstudio.org/ pour le supprimer"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr ""
-
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, fuzzy, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Respont direizh"
-
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Dibosupl eo en em lugañ da \"%s\""
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Luget d'ar servijer %s:%s gant %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
+#~ msgid "Address"
+#~ msgstr "Chomlec'h"
 
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "C'hwitet an diskleriadenn gant \"%s\""
+#~ msgid "City:"
+#~ msgstr "Kêr:"
 
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
+#~ msgid "Company:"
+#~ msgstr "Embregerezh:"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "Diwelus"
+#~ msgid "Country:"
+#~ msgstr "Bro:"
 
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "Ezlinenn"
+#~ msgid "Given:"
+#~ msgstr "Anv bihan:"
 
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "%s on"
+#~ msgid "Middle:"
+#~ msgstr "Eil anv bihan:"
 
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-#, fuzzy
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Sifret eo ar gemennadenn-mañ]"
+#~ msgid "Position:"
+#~ msgstr "Plas:"
 
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Titl : %s\n"
-"%s"
+#~ msgid "Prefix:"
+#~ msgstr "Rakger:"
 
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr ""
+#~ msgid "Role:"
+#~ msgstr "Perzh:"
 
-# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr ""
+#~ msgid "State:"
+#~ msgstr "Stad:"
 
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr ""
+#~ msgid "Suffix:"
+#~ msgstr "Lostger:"
 
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ou python-pysqlite2) n'eo ket staliet. O kuitaat..."
+#~ msgid "_Retrieve"
+#~ msgstr "_Kargañ"
 
-#: ../src/common/exceptions.py:30
-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"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Dilemel diouzh ar roll"
 
-#: ../src/common/exceptions.py:38
-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"
+#~ msgid "A_ccounts"
+#~ msgstr "_Kontoù"
 
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Dihegerz eo bus an estez.\n"
-"Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
+#~ msgid "_Filter:"
+#~ msgstr "_Sil:"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "one"
-msgstr "Hini ebet"
+#~ msgid "Ask:"
+#~ msgstr "Goulenn:"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "two"
-msgstr "piv"
+#~ msgid "Client:"
+#~ msgstr "Poellad:"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "three"
-msgstr "Straed:"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "four"
-msgstr "Porzh:"
+#~ msgid "Subscription:"
+#~ msgstr "Koumanant:"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "five"
-msgstr "restr"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Bep %s _munutenn"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr ""
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: ../src/common/fuzzyclock.py:43
-#, fuzzy
-msgid "seven"
-msgstr "Darvoud"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Atav e weloc'h anezhañ ezlinenn."
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr ""
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s a zo bremañ %s (%s)"
 
-#: ../src/common/fuzzyclock.py:43
 #, fuzzy
-msgid "nine"
-msgstr "_Kenderc'hel"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr ""
+#~ msgid "Network Manager support not available"
+#~ msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/common/fuzzyclock.py:43
-#, fuzzy
-msgid "eleven"
-msgstr "Dilemel"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr ""
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr ""
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Support du gestionnaire de sessions indisponible (module gnome.ui "
+#~ "manquant)"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr ""
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Implij: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr ""
+#~ msgid "Private Chat"
+#~ msgstr "Flap prevez"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr ""
+#~ msgid "Group Chat"
+#~ msgstr "Flap a-stroll"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr ""
+#~ msgid "%s is now %s"
+#~ msgstr "%s a zo bremañ %s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr ""
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s ne seblant ket bezañ ur JID a-feson"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr ""
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr ""
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr "Rankout a rit bezañ luget evit kaout titouroù an darempred."
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "ten to %1"
-msgstr "Emezelañ war %s"
+#~ msgid "_New group chat"
+#~ msgstr "Flap a-stroll"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr ""
+#~ msgid "_Log on"
+#~ msgstr "_Lugañ"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr ""
+#~ msgid "Log _off"
+#~ msgstr "_Dilugañ"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr ""
+#~ msgid "Save passphrase"
+#~ msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr ""
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Kas %s er strollad %s"
 
-#: ../src/common/fuzzyclock.py:62
-#, fuzzy
-msgid "Morning"
-msgstr "O labourat"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Strollañ %s ha %s"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:63
-#, fuzzy
-msgid "Noon"
-msgstr "Hini ebet"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:63
 #, fuzzy
-msgid "Evening"
-msgstr "Darvoud"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr ""
-
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Arouezenn ziereizh en anv-arveriad-ez"
-
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Chomlec'h ar servijer dre ret"
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Arouezenn zireizh en anv-ostiz."
-
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr ""
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s Go"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s Go"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s Mo"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s Mo"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s Ko"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s Ko"
-
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s o"
-
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr ""
-
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr ""
-
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "D_ihegerz"
-
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Prest da flapiñ"
-
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Prest da flapiñ"
-
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Hegerz"
-
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Hegerz"
-
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "O lugañ"
-
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "E_zvezant"
-
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Ezlinenn"
-
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Ezlinenn"
-
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "_Diwelus"
-
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "Dianav"
-
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "fazi"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "A guzha an nozelennoù er prenestroù-flapiñ"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "Hini ebet"
-
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Da"
-
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "An daou"
-
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "Hini ebet"
-
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Emezelañ"
-
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "Hini ebet"
-
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Kasourien"
-
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Kasour-ez"
-
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Perzhidi"
-
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Perzhiad-ez"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Luget d'ar servijer %s:%s gant %s"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Gweladennerien"
+#~ msgid "invisible"
+#~ msgstr "Diwelus"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Gweladenner-ez"
+#~ msgid "offline"
+#~ msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:301
-#, fuzzy
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Hini ebet"
+#~ msgid "I'm %s"
+#~ msgstr "%s on"
 
-#: ../src/common/helpers.py:303
 #, fuzzy
-msgid "Owner"
-msgstr "_Perc'hener-ez"
-
-#: ../src/common/helpers.py:305
-#, fuzzy
-msgid "Administrator"
-msgstr "_Merour-ez"
-
-#: ../src/common/helpers.py:307
-#, fuzzy
-msgid "Member"
-msgstr "_Ezel"
-
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "a zo aketus d'ar gaozeadenn"
-
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "a ra un dra bennak all"
-
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "a skriv ur gemennadenn..."
-
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "a zo paouezet da skrivañ ar gemennadenn"
-
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
-
-#: ../src/common/helpers.py:881
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d gemennadenn nevez"
-msgstr[1] "Gajim - kemennadennoù nevez: %d"
-
-#: ../src/common/helpers.py:887
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d gemennadenn simpl nevez"
-msgstr[1] "Gajim - kemennadennoù simpl nevez: %d"
-
-#: ../src/common/helpers.py:893
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d gemennadenn webgaoz nevez"
-msgstr[1] "Gajim - kemennadennoù webgaoz nevez: %d"
-
-#: ../src/common/helpers.py:899
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d gemennadenn brevez nevez"
-msgstr[1] "Gajim - kemennadennoù prevez nevez: %d"
-
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
-
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "Gajim - %d gemennadenn simpl nevez"
+#~ msgstr[1] "Gajim - kemennadennoù simpl nevez: %d"
 
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr "Cyan"
-
-#: ../src/common/optparser.py:302
 #, fuzzy
-msgid "migrating logs database to indeces"
-msgstr "o krouiñ titourva an istoradur"
-
-#: ../src/common/passwords.py:86
-#, fuzzy, python-format
-msgid "Gajim account %s"
-msgstr "eus ar gont %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "Gajim - %d gemennadenn webgaoz nevez"
+#~ msgstr[1] "Gajim - kemennadennoù webgaoz nevez: %d"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
 #, fuzzy
-msgid "Connection to host could not be established"
-msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
-
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "Gajim - %d gemennadenn brevez nevez"
+#~ msgstr[1] "Gajim - kemennadennoù prevez nevez: %d"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr ""
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, fuzzy
-msgid "Could not start local service"
-msgstr "Dibosupl eo kargañ ar skeudenn"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, fuzzy, python-format
-msgid "Unable to bind to port %d."
-msgstr "Impossible de rejoindre le salon"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, fuzzy, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Dibosupl eo en em lugañ da \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Sifret eo ar gemennadenn-mañ]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, fuzzy, python-format
-msgid "Error while adding service. %s"
-msgstr "fazi en ur gas %s ( %s )"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
 #, fuzzy
 #~ msgid "_New room"
@@ -6707,9 +10019,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Anv sal pe servijer direizh"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Aozadur D-Bus dianav: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "Gant berzh eo bet embannet ar vCard"
 
@@ -6719,9 +10028,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "O tilec'hiañ an istoradur..."
 
-#~ msgid "_Join New Room"
-#~ msgstr "_Ebarzhiñ ur webgaoz nevez"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d gemennadenn nevez"
@@ -6736,19 +10042,9 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Send File"
 #~ msgstr "Kas ur restr"
 
-#~ msgid "Underline"
-#~ msgstr "Islinennañ"
-
-#~ msgid "Would you like to overwrite it?"
-#~ msgstr "Voulez-vous l'écraser ?"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Re_joindre un nouveau salon..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr ""
-#~ "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
-
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Choisissez une des options suivantes :</b>"
@@ -6757,10 +10053,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgstr "Supprimer le message du jour"
 
 #, fuzzy
-#~ msgid "I want a notification popup:"
-#~ msgstr "Noti_fications d'état de discussion"
-
-#, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s souhaite vous envoyer un fichier :"
 
@@ -6776,9 +10068,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "_XML Console..."
 #~ msgstr "Console _XML..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "Choisissez un Avatar"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr ""
 #~ "Utiliser la vue compacte quand vous ouvrez une fenêtre de discussion"
@@ -6786,9 +10075,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Utiliser la vue compacte quand vous ouvrez une fenêtre de salon"
 
-#~ msgid "plain"
-#~ msgstr "Standard"
-
 #~ msgid "Send"
 #~ msgstr "Envoyer"
 
@@ -6806,11 +10092,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "L'historique a été corectement récupéré."
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr ""
-#~ "Si cette case est cochée, Gajim placera une icône dans la zone de "
-#~ "notification"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Commencer une discussion avec le compte %s"
@@ -6827,15 +10108,9 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Sound"
 #~ msgstr "Son"
 
-#~ msgid "Text"
-#~ msgstr "Texte"
-
 #~ msgid "Image"
 #~ msgstr "Image"
 
-#~ msgid "From %s"
-#~ msgstr "De %s"
-
 #~ msgid "To %s"
 #~ msgstr "À %s"
 
@@ -6909,9 +10184,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ "pysqlite2, si vous voulez migrer votre historique dans la nouvelle base "
 #~ "de donnée, lisez http://trac.gajim.org/wiki/MigrateLogToDot9DB. Quitte..."
 
-#~ msgid "Image is too big"
-#~ msgstr "L'image est trop grande"
-
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
diff --git a/po/cs.po b/po/cs.po
index 319b1382e..658fc8509 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 15:41+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-02-06 21:51+0100\n"
 "Last-Translator: scippio <scippio@berounet.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -42,7 +42,7 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
 msgstr "Vstoupit do _Diskuze"
 
@@ -300,9 +300,9 @@ msgstr "Upravit osobní informace..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1021
-#: ../src/common/helpers.py:1033 ../src/notify.py:498 ../src/notify.py:529
-#: ../src/notify.py:541
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -311,11 +311,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:91 ../src/dialogs.py:101 ../src/dialogs.py:109
-#: ../src/dialogs.py:163 ../src/roster_window.py:2702
-#: ../src/roster_window.py:5177
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Obecné"
 
@@ -378,22 +378,20 @@ 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:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1543
-#: ../src/config.py:2037 ../src/config.py:3642
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. None means no proxy profile selected
-#. GPG Key
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1132
-#: ../src/config.py:1203 ../src/config.py:1451 ../src/config.py:1456
-#: ../src/config.py:1944 ../src/config.py:2022 ../src/config.py:2036
-#: ../src/config.py:3138 ../src/config.py:3206 ../src/config.py:3632
-#: ../src/config.py:3641 ../src/dialogs.py:288 ../src/dialogs.py:290
-#: ../src/dialogs.py:507 ../src/roster_window.py:2772
-#: ../src/roster_window.py:2779 ../src/roster_window.py:2786
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Žádný"
 
@@ -557,7 +555,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:664
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -572,7 +570,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5129
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Přejme_novat"
 
@@ -790,7 +788,7 @@ msgid "All statuses"
 msgstr "Všechny stavy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:96 ../src/common/helpers.py:270
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Pryč"
 
@@ -807,7 +805,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -816,7 +814,7 @@ msgid "Launch a command"
 msgstr "Provést příkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Nedostupný"
 
@@ -994,7 +992,7 @@ msgid "Join _Group Chat"
 msgstr "Vstoupit do _Diskuze"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "Přid_at do Seznamu"
 
@@ -1046,10 +1044,10 @@ msgstr "Přid_at do Seznamu"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5804
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historie"
 
@@ -1090,24 +1088,13 @@ msgid "Edit Groups"
 msgstr "Upravit skupiny"
 
 #: ../data/glade/esession_info_window.glade.h:1
-msgid "(ESession info)"
+#, fuzzy
+msgid "(<b>ESession</b> info)"
 msgstr "(ESession info)"
 
 #: ../data/glade/esession_info_window.glade.h:2
-msgid "Close"
-msgstr "Zavřít"
-
-#: ../data/glade/esession_info_window.glade.h:3
-msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+msgid "_Verify"
 msgstr ""
-"Chcete-li mít jistotu, že pouze důvěryhodné osoby mohou číst vaše zprávy "
-"nebo vám poslat zprávu, je potřeba ověřit jejich identitu"
-
-#: ../data/glade/esession_info_window.glade.h:4
-msgid "Verify remote identity"
-msgstr "Ověřit identitu"
 
 #: ../data/glade/features_window.glade.h:2
 msgid "<b>List of possible features in Gajim:</b>"
@@ -1169,7 +1156,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:791
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -1177,7 +1164,7 @@ msgstr "_Pokračovat"
 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:191
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
@@ -1226,7 +1213,7 @@ msgstr "Úprava témat Gajimu"
 msgid "Gone"
 msgstr "Pryč"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:76
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Neaktivní"
 
@@ -1335,13 +1322,13 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoř nový zápis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:295
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Odesílatel"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:165
-#: ../src/history_manager.py:196
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Předmět"
 
@@ -1393,7 +1380,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Hledat v databázi"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:306
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Historie konverzace"
 
@@ -1416,7 +1403,7 @@ msgstr "Najít:"
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1691
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
@@ -1443,8 +1430,8 @@ msgstr "Nedávno:"
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1179
-#: ../src/disco.py:1600
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -1545,7 +1532,8 @@ 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 (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Změnit předmět místnosti (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1575,7 +1563,7 @@ msgstr "Zobrazit profil kontaktu (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "Ode_slat"
 
@@ -1741,10 +1729,6 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Smajlíky:"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1754,7 +1738,7 @@ msgstr ""
 "vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
 "chcete zobrazovat v oknech rozhovoru."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1764,7 +1748,7 @@ msgstr ""
 "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:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1772,17 +1756,17 @@ 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:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 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:53
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1790,13 +1774,13 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
 "emailu"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:53
 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:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1804,7 +1788,7 @@ 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:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1812,7 +1796,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1820,28 +1804,28 @@ 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:58
+#: ../data/glade/preferences_window.glade.h:57
 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:59
+#: ../data/glade/preferences_window.glade.h:58
 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:60
+#: ../data/glade/preferences_window.glade.h:59
 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:61
+#: ../data/glade/preferences_window.glade.h:60
 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 "
@@ -1851,7 +1835,7 @@ msgstr ""
 "nastavení jazyk přes pravé tlačítko na vstupním poli, tak se použije výchozí "
 "jazyk pro tento kontakt nebo diskuzi."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1861,7 +1845,7 @@ msgstr ""
 "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:63
+#: ../data/glade/preferences_window.glade.h:62
 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 "
@@ -1871,7 +1855,7 @@ msgstr ""
 "používáte E2E šifrování, musí vzdálený kontakt povolit logování, jinak "
 "zprávy nebudou logovány."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1879,15 +1863,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
 "emailu"
 
-#: ../data/glade/preferences_window.glade.h:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
-"diskuzích"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1897,7 +1873,7 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1905,7 +1881,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim se nebude pokáždé ptát na zprávu stavu. Místo toho "
 "použije výchozí nadefinovanou zprávu."
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1913,48 +1889,44 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "animované nebo statické grafické smajlíky"
 
-#: ../data/glade/preferences_window.glade.h:69
-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:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Logovat šifrované rozhovory"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "_Kompaktní okno zprávy"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorni mě na kontakty které se přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorni mě na kontakty které se odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _GMail emailu"
 
 # FIXME: snad je to ok?
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Moje události"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1964,19 +1936,19 @@ msgstr ""
 "Upozorni mě\n"
 "Zobrazit pouze v rosteru"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1984,23 +1956,28 @@ 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:86 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Seřadit podle stavu"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "Výchozí _ikony stavů:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -2008,7 +1985,7 @@ msgstr ""
 "Automatická zpráva stavu 'Pryč'. Pokud je prázdná, tak Gajim nezmění "
 "současný stav"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -2016,42 +1993,52 @@ msgstr ""
 "Automatická zpráva stavu 'Nedostupný'. Pokud je prázdná, tak Gajim nezmění "
 "současný stav"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Používat ikony _transportů"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Použij nastavení _systému"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Když je přijata nová zpráva"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Smajlíky:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 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:100
+#, fuzzy
+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:101
 msgid "_Incoming message:"
 msgstr "_Příchozí zpráva:"
@@ -2085,22 +2072,28 @@ msgid "_Send chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Seřadit podle stavu"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "Zvýraznění _URL:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "Chování _okna"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Vstoupit do _Diskuze"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Není v rosteru"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutách"
 
@@ -2148,7 +2141,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2559
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
@@ -2292,7 +2285,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titul:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:299
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Postavení:</b>"
 
@@ -2352,10 +2345,8 @@ msgstr "Odstranit účet z Gajimu i ze _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5165 ../src/roster_window.py:5622
-#: ../src/roster_window.py:5751
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "Odst_ranit"
 
@@ -2377,59 +2368,64 @@ msgstr "Upravit _skupiny"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5694
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5084 ../src/roster_window.py:5575
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5094 ../src/roster_window.py:5660
+#, fuzzy
+msgid "Remo_ve"
+msgstr "Odst_ranit"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Odeslat jednoduchou _zprávu..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Odeslat _Soubor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Nastavit vlastní Avatar"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Dovol kontaktu vidět můj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5156 ../src/roster_window.py:5612
-#: ../src/roster_window.py:5741
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Blokovat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zakaž mu/jí vidět můj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
 msgid "_Ignore"
 msgstr "_Ignorovat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "_Spravovat kontakt"
@@ -2443,8 +2439,8 @@ msgid "_Subscription"
 msgstr "_Autorizace"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5150 ../src/roster_window.py:5606
-#: ../src/roster_window.py:5738
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
@@ -2453,45 +2449,46 @@ msgid "_Unignore"
 msgstr "_Neignorovat"
 
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "Úč_ty"
-
-#: ../data/glade/roster_window.glade.h:2
 msgid "Add _Contact..."
 msgstr "Přid_at Kontakt..."
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
 msgstr "Vlastnosti serveru"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "_Přenosy souborů"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené dotazy - FAQ (online)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Nápověda online"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Zobrazuj trans_porty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _roster"
 msgstr "Zobrazit _Seznam"
 
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+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:13
 #: ../data/glade/subscription_request_window.glade.h:6
@@ -2502,7 +2499,7 @@ msgstr "_Akce"
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1333
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Úpravy"
 
@@ -2543,11 +2540,11 @@ msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5763
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1191
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
 msgid "_Search"
 msgstr "_Najít"
 
@@ -2765,13 +2762,13 @@ msgstr "Přiřadit Open_PGP klíč"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5595
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5721
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
@@ -2799,72 +2796,71 @@ msgstr "Stav:"
 msgid "Modify Account"
 msgstr "Upravit účet"
 
-#: ../src/adhoc_commands.py:251
+#: ../src/adhoc_commands.py:264
 msgid "Cancel confirmation"
 msgstr "Zrušit ověření"
 
-#: ../src/adhoc_commands.py:252
+#: ../src/adhoc_commands.py:265
 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:297
+#: ../src/adhoc_commands.py:304
 msgid "Service changed the session identifier."
 msgstr "Služba změnila identifikátor sezení."
 
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:317
 msgid "Service sent malformed data"
 msgstr "Služba odeslala chybné data"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:391
+#: ../src/adhoc_commands.py:398
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
 #. For i18n
-#: ../src/advanced.py:56
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktivní"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Neaktivní"
 
-#: ../src/advanced.py:58
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:59
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Číslo"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:61
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Barva"
 
-#: ../src/advanced.py:70
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Název volby"
 
-#: ../src/advanced.py:76
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced.py:84
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:140
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Žádný)"
 
-#. we talk about password
-#: ../src/advanced.py:243
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Skryté"
 
@@ -2873,195 +2869,251 @@ msgstr "Skryté"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Běloruština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulharština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretonština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Němčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Řečtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Španělština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francouzština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Chorvatština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norština (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilská portugalština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Švédština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Čínština"
 
-#: ../src/chat_control.py:331
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
 
 #. we are not connected
-#: ../src/chat_control.py:354 ../src/chat_control.py:581
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:355 ../src/chat_control.py:582
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1168 ../src/chat_control.py:1559
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1189 ../src/chat_control.py:2036
-#: ../src/common/contacts.py:106 ../src/common/helpers.py:68
-#: ../src/common/helpers.py:282 ../src/conversation_textview.py:794
-#: ../src/dialogs.py:890 ../src/gajim.py:1600 ../src/roster_window.py:943
-#: ../src/roster_window.py:1543 ../src/roster_window.py:1545
-#: ../src/roster_window.py:1884 ../src/roster_window.py:5269
-#: ../src/roster_window.py:5446
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
-#: ../src/chat_control.py:1318 ../src/tooltips.py:622
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: ../src/chat_control.py:1320 ../src/tooltips.py:627
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: ../src/chat_control.py:1322 ../src/tooltips.py:632
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: ../src/chat_control.py:1326
-#, python-format
-msgid "<b>\"%(title)s\"</b> by "
-msgstr "<b>\"%(title)s\"</b> od"
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, fuzzy, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 
-#: ../src/chat_control.py:1333
-#, python-format
-msgid "%(title)s by %(artist)s\n"
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
 msgstr "\"%(title)s\" od %(artist)s\n"
 
-#: ../src/chat_control.py:1460
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
-#: ../src/chat_control.py:1549
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:1567 ../src/chat_control.py:1818
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr "Sezení BUDE logováno"
+
+#: ../src/chat_control.py:1560
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
-#: ../src/chat_control.py:1569 ../src/chat_control.py:1816
-msgid "Session WILL be logged"
-msgstr "Sezení BUDE logováno"
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Použít autentifikaci"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Použít autentifikaci"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
+#, python-format
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
 # FIXME: co je zeroconf?
-#: ../src/chat_control.py:1643
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Příkaz není podporován pro zeroconf účet."
 
-#: ../src/chat_control.py:1654 ../src/groupchat_control.py:1523
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/chat_control.py:1657 ../src/groupchat_control.py:1537
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/chat_control.py:1660 ../src/groupchat_control.py:1542
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použití: /%s, skryje tlačítka rozhovoru."
 
-#: ../src/chat_control.py:1663 ../src/groupchat_control.py:1558
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3070,229 +3122,249 @@ msgstr ""
 "Použití: /%(command)s <akce>, pošle akci do aktuální místnosti. Použijte "
 "třetí osobu (například /%(command)s explodoval.)"
 
-#: ../src/chat_control.py:1668
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Použití: /%s, pošle ping kontaktu"
 
-#: ../src/chat_control.py:1671
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Použití: /%s, pošle zprávu kontaktu"
 
-#: ../src/chat_control.py:1674 ../src/groupchat_control.py:1581
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
-#: ../src/chat_control.py:1805
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Tato zpráva je zašifrovaná]"
+
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Sezení BUDE logováno"
+
 #: ../src/chat_control.py:1812
-msgid "E2E encryption enabled"
-msgstr "E2E Šifrování zapnuto"
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Sezení NEBUDE logováno"
 
-#: ../src/chat_control.py:1823
+#: ../src/chat_control.py:1817
 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:1825
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:1854 ../src/chat_control.py:1861
-#: ../src/chat_control.py:1867
-msgid "The following message was "
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "Následující zpráva byla "
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
 msgstr "Následující zpráva byla "
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2209
+#: ../src/chat_control.py:2225
 #, 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:2210
+#: ../src/chat_control.py:2226
 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:2361 ../src/gajim.py:159
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: ../src/chat_control.py:2362 ../src/gajim.py:160
-#, python-format
+#: ../src/chat_control.py:2377
+#, fuzzy, python-format
 msgid ""
-"The database file (%s) cannot be read. Try to repare it or remove it (all "
+"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 to nebo ho smažte (tím ztratítu "
 "všechny zprávy v historii)."
 
-#: ../src/chat_control.py:2594
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
 
-#: ../src/common/check_paths.py:38
+#: ../src/common/check_paths.py:43
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:105 ../src/common/check_paths.py:116
-#: ../src/common/check_paths.py:123
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
 #, 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:106 ../src/common/check_paths.py:117
-#: ../src/common/check_paths.py:124 ../src/common/check_paths.py:132
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:131
+#: ../src/common/check_paths.py:136
 #, 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:147
+#: ../src/common/check_paths.py:152
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
 
-#: ../src/common/commands.py:74
+#: ../src/common/commands.py:80
 msgid "Change status information"
 msgstr "Informace o změně stavu"
 
-#: ../src/common/commands.py:87
+#: ../src/common/commands.py:93
 msgid "Change status"
 msgstr "Změnit stav"
 
-#: ../src/common/commands.py:88
+#: ../src/common/commands.py:94
 msgid "Set the presence type and description"
 msgstr "Nastav typ přítomnosti a popisek"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:100
 msgid "Free for chat"
 msgstr "Ukecaný"
 
-#: ../src/common/commands.py:95
+#: ../src/common/commands.py:101
 msgid "Online"
 msgstr "Připojen"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:103
 msgid "Extended away"
 msgstr "Dlouho pryč"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:104
 msgid "Do not disturb"
 msgstr "Nerušit"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:105
 msgid "Offline - disconnect"
 msgstr "Odpojený - odpojit"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:110
 msgid "Presence description:"
 msgstr "Popis stavu: "
 
-#: ../src/common/commands.py:139
+#: ../src/common/commands.py:145
 msgid "The status has been changed."
 msgstr "Stav se změnil."
 
-#: ../src/common/commands.py:170 ../src/common/commands.py:194
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Opustit diskuzi"
 
-#: ../src/common/commands.py:184
+#: ../src/common/commands.py:191
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s v %(room_jid)s"
 
-#: ../src/common/commands.py:188
+#: ../src/common/commands.py:195
 msgid "You have not joined a groupchat."
 msgstr "Nepřipojil jsi se k diskuzi."
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:202
 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:199 ../src/common/contacts.py:87
-#: ../src/common/contacts.py:119 ../src/common/helpers.py:68
-#: ../src/roster_window.py:811 ../src/roster_window.py:1547
-#: ../src/roster_window.py:1549 ../src/roster_window.py:5054
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Diskuze"
 
-#: ../src/common/commands.py:235
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "Opustil(a) jste následující diskuze:"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr "Přeposlat nepřečtené zprávy"
 
-#: ../src/common/commands.py:267
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr "Všechny nepřečtené zprávy byly přeposlány."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:82
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:87
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:88
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S ('Pryč' jako výsledek nečinnosti větší než $T min)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:82
+#: ../src/common/config.py:88
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:91
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S ('Nedostupný' jako výsledek nečinnosti větší než $T min)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:85
+#: ../src/common/config.py:91
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:111
 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:442
-#: ../src/common/optparser.py:212 ../src/common/optparser.py:430
-#: ../src/common/optparser.py:464 ../src/gajim.py:3053
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "výchozí"
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Povolit lokální zprávy typu zeroconf"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Jazyk použitý kontrolou pravopisu"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3302,7 +3374,7 @@ msgstr ""
 "'někdy' - vypiš čas každou print_ichat_every_foo_minutes minutu.\n"
 "'nikdy' - nevypisuj čas."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:121
 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. "
@@ -3312,17 +3384,17 @@ msgstr ""
 "to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně "
 "přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:125
 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
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3333,7 +3405,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, "
 "nainstalujte docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3341,7 +3413,7 @@ msgstr ""
 "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
 "diskuzi."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3349,7 +3421,7 @@ msgstr ""
 "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
 "jiný v diskuzi."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3360,23 +3432,19 @@ msgstr ""
 "informací shlédněte dokumentaci pythonu funkce strftime na: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky, které budou vypisovány před přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky, které budou vypisovány za přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:158
-msgid "The username used to identify the Last.fm account."
-msgstr "Uživatelské jméno pro Last.gm účet."
-
-#: ../src/common/config.py:162
+#: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:169
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3384,11 +3452,11 @@ msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:170
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:171
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3396,11 +3464,11 @@ msgstr ""
 "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
 "chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:173
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:176
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3409,11 +3477,11 @@ msgstr ""
 "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
 "která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:179
 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:174
+#: ../src/common/config.py:180
 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 "
@@ -3425,14 +3493,14 @@ msgstr ""
 "synchronizují se s globálním stavem) v závislosti na stavu síťového "
 "připojení."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:181
 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:176
+#: ../src/common/config.py:182
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3440,7 +3508,7 @@ msgstr ""
 "Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, "
 "composing_only nebo disabled."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:184
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3448,11 +3516,11 @@ msgstr ""
 "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
 "každých x minut."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:185
 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:180
+#: ../src/common/config.py:186
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3460,7 +3528,7 @@ msgstr ""
 "Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu "
 "mezerami oddělením Jabber ID místností."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:187
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3468,7 +3536,7 @@ 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:184
+#: ../src/common/config.py:190
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3477,27 +3545,27 @@ msgstr ""
 "rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
 "portů."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:192
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:194
 msgid "Notify of events in the system trayicon."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:200
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:201
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:202
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -3505,7 +3573,7 @@ msgstr ""
 "Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení "
 "zaznamenávání zpráv?"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 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 "
@@ -3516,16 +3584,16 @@ msgstr ""
 "oddělené čárkami. Povolené skupiny jsou 1, 2, 5, 14, 15, 16, 17 a 18. Vyšší "
 "čísla jsou více bezpečná, ale vyžadují delší dobu výpočtu při startu sezení."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:213
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:218
 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:213
+#: ../src/common/config.py:219
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3533,14 +3601,14 @@ msgstr ""
 "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
 "Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 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:215
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3548,7 +3616,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
 "zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3556,11 +3624,11 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:227
 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:222
+#: ../src/common/config.py:228
 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."
@@ -3568,7 +3636,7 @@ msgstr ""
 "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
 "naposledy avatara nebo kterého uložený je příliš starý."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:229
 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."
@@ -3576,7 +3644,7 @@ msgstr ""
 "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
 "kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:230
 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 "
@@ -3589,29 +3657,29 @@ msgstr ""
 "stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. "
 "Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:232
 msgid "Background color of contacts when they just signed in."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed out."
 msgstr "Barva pozadí kontaktů, jež se přávě odhlásili."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:235
 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:230
+#: ../src/common/config.py:236
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:237
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:238
 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 "
@@ -3621,7 +3689,7 @@ msgstr ""
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:240
 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 "
@@ -3632,7 +3700,7 @@ msgstr ""
 "neposílala v presenci u diskuzí."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:237
+#: ../src/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3651,31 +3719,31 @@ msgstr ""
 "zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
 "aby se projevila"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:244
 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:239
+#: ../src/common/config.py:245
 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:240
+#: ../src/common/config.py:246
 msgid "Hides the buttons in chat windows."
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:247
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:248
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:249
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:250
 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."
@@ -3684,23 +3752,26 @@ msgstr ""
 "stejný člověk, jako v předchozí zprávě."
 
 # FIXME: netusim co to je... najit
-#: ../src/common/config.py:245
+#: ../src/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:252
 msgid "Smooth scroll message in conversation window"
 msgstr "Jemné posouvání v okně diskuze"
 
-#: ../src/common/config.py:247
-msgid "List of colors that will be used to color nicknames in group chats."
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr "Seznam barev používaných k obarvení přezdívek v diskuzích."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:254
 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:249
+#: ../src/common/config.py:255
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3708,7 +3779,7 @@ msgstr ""
 "Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:256
 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 "
@@ -3718,7 +3789,7 @@ msgstr ""
 "BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
 "žádnou zprávu."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:257
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3726,7 +3797,7 @@ msgstr ""
 "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
 "k účtům."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:258
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3734,7 +3805,7 @@ msgstr ""
 "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
 "řádků skupin."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:259
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3742,7 +3813,7 @@ msgstr ""
 "Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny "
 "příchozí zprávy jako uvedený typ"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3750,7 +3821,7 @@ msgstr ""
 "Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal "
 "poslední zprávu, pokud již okno rozhovoru není otevřené."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3758,11 +3829,11 @@ msgstr ""
 "Je-li povoleno, Gajim převede řetězec mezi $$ a $$ na obrázek pomocí dvips a "
 "převede před vložením do okna rozhovoru."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:262
 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:257
+#: ../src/common/config.py:263
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3770,18 +3841,18 @@ msgstr ""
 "Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou "
 "smazány."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:264
 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:259
+#: ../src/common/config.py:265
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:266
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3789,7 +3860,7 @@ msgstr ""
 "Změnou hodnoty změníte velikost zobrazovaných formulí latexu. Vyšší znamená "
 "větší."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:267
 msgid ""
 "Valid uri schemes. Only schemes in this list will be made accepted as \"real"
 "\" uri."
@@ -3797,7 +3868,7 @@ msgstr ""
 "Validní URI schémata. Pouze schémata v tomto seznamu budou akceptována jako "
 "\"správné\" URI."
 
-#: ../src/common/config.py:272
+#: ../src/common/config.py:278
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3805,7 +3876,7 @@ msgstr ""
 "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
 "nastavení jako položky autopriority_*."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:286
 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"
@@ -3814,26 +3885,26 @@ msgstr ""
 "'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být "
 "použito pouze pokud restore_last_status je vypnutý"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:287
 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:286
+#: ../src/common/config.py:292
 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:288
+#: ../src/common/config.py:294
 msgid "Enable ESessions encryption for this account."
 msgstr "Povolit ESessions šifrování pro tento účet."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:295
 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:290
+#: ../src/common/config.py:296
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -3841,21 +3912,21 @@ msgstr ""
 "Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. Možnosti "
 "jsou: tls, ssl nebo plain"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:297
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Zobrazit varování před odesláním hesla, pokud je odesíláno jako prostý text."
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:298
 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:294
+#: ../src/common/config.py:300
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:312
 msgid ""
 "How many seconds to wait for the answer of keepalive packet before we try to "
 "reconnect."
@@ -3864,11 +3935,11 @@ msgstr ""
 "pokusit o připojení."
 
 #. yes, no, ask
-#: ../src/common/config.py:310
+#: ../src/common/config.py:316
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:320
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3876,120 +3947,120 @@ 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:328
+#: ../src/common/config.py:334
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:335
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: ../src/common/config.py:383
+#: ../src/common/config.py:389
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:390
 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:385 ../src/common/config.py:388
+#: ../src/common/config.py:391 ../src/common/config.py:394
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:400
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:395
+#: ../src/common/config.py:401
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:396 ../src/common/config.py:398
-#: ../src/common/config.py:399 ../src/common/config.py:402
-#: ../src/common/config.py:403
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' nebo ''"
 
-#: ../src/common/config.py:409 ../src/common/pep.py:81
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:410
+#: ../src/common/config.py:416
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:410
+#: ../src/common/config.py:416
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:411 ../src/common/pep.py:54
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:411
+#: ../src/common/config.py:417
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:412
+#: ../src/common/config.py:418
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:412
+#: ../src/common/config.py:418
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:413 ../src/common/pep.py:107
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:419
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:420
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:420
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:421
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:421
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:425
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:426
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:421 ../src/config.py:1383
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:428
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:429
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:424 ../src/common/config.py:425
+#: ../src/common/config.py:430 ../src/common/config.py:431
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:441
 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."
@@ -3997,146 +4068,148 @@ 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:436
+#: ../src/common/config.py:442
 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:445 ../src/common/optparser.py:226
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:449 ../src/common/optparser.py:212
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:459
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:463
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:69
+#: ../src/common/connection_handlers.py:71
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/common/connection_handlers.py:227
+#: ../src/common/connection_handlers.py:233
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
 msgid "Wrong host"
 msgstr "Nesprávné jméno počítače"
 
-#: ../src/common/connection_handlers.py:228
+#: ../src/common/connection_handlers.py:234
 msgid "Invalid local address? :-O"
 msgstr "Neplatná místní adresa? :-O"
 
-#: ../src/common/connection_handlers.py:629
+#: ../src/common/connection_handlers.py:639
 #, 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:912
-#: ../src/common/connection_handlers.py:1807
-#: ../src/common/connection_handlers.py:1854
-#: ../src/common/connection_handlers.py:2036
-#: ../src/common/connection_handlers.py:2155 ../src/common/connection.py:1195
-#: ../src/gajim.py:376
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Chyba zápisu na disk (možná je plný?)"
 
-#: ../src/common/connection_handlers.py:1115 ../src/common/connection.py:832
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:1116 ../src/common/connection.py:833
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../src/common/connection_handlers.py:1923
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Nelze přečíst soubor databáze (%s). Opravte to nebo ho smažte (tím ztratítu "
+"všechny zprávy v historii)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nepovolena: %s"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1993
-#: ../src/common/connection_handlers.py:1996
-#: ../src/common/connection_handlers.py:1999
-#: ../src/common/connection_handlers.py:2002
-#: ../src/common/connection_handlers.py:2006
-#: ../src/common/connection_handlers.py:2015
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:1994
+#: ../src/common/connection_handlers.py:2054
 #, 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:1997
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2000
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Vytváření místností není povoleno."
 
-#: ../src/common/connection_handlers.py:2003
+#: ../src/common/connection_handlers.py:2063
 #, 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:2007
+#: ../src/common/connection_handlers.py:2067
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů diskuze %s."
 
-#: ../src/common/connection_handlers.py:2016
-#, python-format
-msgid ""
-"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"
-"Níže vyber jinou přezdívku:"
-
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2047
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2116
 #, 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:2081
+#: ../src/common/connection_handlers.py:2143
 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:2102
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme nyní zapsáni k %s"
 
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2106
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "byla nám zrušena autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2268
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4146,203 +4219,213 @@ msgstr ""
 "správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2293
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1935 ../src/roster_window.py:1955
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
-#: ../src/common/connection.py:60
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
 
-#: ../src/common/connection.py:61
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Nepodařilo se získat certifikát CRL"
 
-#: ../src/common/connection.py:62
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodařilo se dešifrovat podpis certifikátu"
 
-#: ../src/common/connection.py:63
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodařilo se dešifrovat podpis CRL certifikátu"
 
-#: ../src/common/connection.py:64
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Nepodařilo se dešifrovat veřejný klíč vydavatele"
 
-#: ../src/common/connection.py:65
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Chyba podpisu certifikátu"
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "Chyba podpisu CRL certifikátu"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Certifikát není správný"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL certifikát není správný"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "Platnost CRL certifikátu vypršela"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Chyba certifikátu v poli: platnost před"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Chyba certifikátu v poli: platnost po"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Chyba CRL certifikátu v poli: poslední aktualizace"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Chyba CRL certifikátu v poli: příští aktualizace"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "Sám sebou podepsaný certifikát v certifikačním řetězci "
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodařilo se získat certifikát lokálního vydavatele"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "Nepodařilo se ověřit první certifikát"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Certifikační řetězec je přiliš dlouhý"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Certifikát je zrušený"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Překročena delká cesty"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Nepodporované osvědčení certifikátu"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Certifikát je nedůvěryhodný"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr "Neshoduje se název vydavatele"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr "Název klíče se neshoduje s Autoritou"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr "Vydavatelovo sériové číslo se neshoduje s Autoritou"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr "Použítý klíč neobsahuje podpis certifikátu"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: ../src/common/connection.py:260
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:261
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:272
+#: ../src/common/connection.py:278
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s odpověděl chybně na požadavek regisrace: %(error)s"
 
-#: ../src/common/connection.py:306
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:322
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:338
+#: ../src/common/connection.py:341
 #, 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:519
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:604 ../src/common/connection.py:695
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:605 ../src/gajim.py:1022
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:652
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Nemůžu se připojit k \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Spojení s účtem \"%s\" bylo ztraceno"
+
+#: ../src/common/connection.py:666
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4351,7 +4434,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:657
+#: ../src/common/connection.py:671
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -4360,24 +4443,24 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %s"
 
-#: ../src/common/connection.py:696
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:723
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:784
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:785
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4387,12 +4470,12 @@ msgstr ""
 "zdrojů. Zruště jeho používání a zkuste znovu."
 
 # FIXME: co to je?
-#: ../src/common/connection.py:1076
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1078
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4400,11 +4483,11 @@ msgstr "Klíč kontaktu (%s) se neshoduje s klíčem v Gajimu."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1087
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:`27`]"
 
-#: ../src/common/connection.py:1185
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4414,53 +4497,53 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1357
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/contacts.py:85 ../src/common/helpers.py:68
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: ../src/common/contacts.py:89 ../src/common/contacts.py:340
-#: ../src/common/helpers.py:68 ../src/disco.py:113 ../src/disco.py:114
-#: ../src/disco.py:1330 ../src/gajim.py:775 ../src/roster_window.py:845
-#: ../src/roster_window.py:1472 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1683
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:348
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Není v rosteru"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:47
 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:45
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Možnosti D-Bus nemohou být použity"
 
-#: ../src/common/exceptions.py:27
+#: ../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/exceptions.py:44
+#: ../src/common/exceptions.py:47
 msgid "Database cannot be read."
 msgstr "Nemohu číst z databáze."
 
-#: ../src/common/exceptions.py:52
+#: ../src/common/exceptions.py:55
 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:60
+#: ../src/common/exceptions.py:63
 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:68
+#: ../src/common/exceptions.py:71
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -4468,356 +4551,356 @@ msgstr ""
 "Session bus není k dispozici.\n"
 "Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:42
 msgid "one"
 msgstr "jeden"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:42
 msgid "two"
 msgstr "dva"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:42
 msgid "three"
 msgstr "tři"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:42
 msgid "four"
 msgstr "čtyři"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:42
 msgid "five"
 msgstr "pět"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:42
 msgid "six"
 msgstr "šest"
 
-#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:43
 msgid "seven"
 msgstr "sedm"
 
-#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:43
 msgid "eight"
 msgstr "osm"
 
-#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:43
 msgid "nine"
 msgstr "devět"
 
-#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:43
 msgid "ten"
 msgstr "deset"
 
-#: ../src/common/fuzzyclock.py:48
+#: ../src/common/fuzzyclock.py:43
 msgid "eleven"
 msgstr "jedenáct"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:44
 msgid "twelve"
 msgstr "dvanáct"
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "$0 o'clock"
 msgstr "$0 hodin"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past $0"
 msgstr "pět po $0"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "ten past $0"
 msgstr "deset po $0"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past $0"
 msgstr "čtvrt po $0"
 
-#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty past $0"
 msgstr "dvacet po $0"
 
-#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past $0"
 msgstr "dvacet pět po $%"
 
-#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "half past $0"
 msgstr "půl $1"
 
-#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to $1"
 msgstr "dvacet pět do $1"
 
-#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "twenty to $1"
 msgstr "dvacet do $1"
 
-#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to $1"
 msgstr "tři čtvrtě na $1"
 
-#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "ten to $1"
 msgstr "za deset $1"
 
-#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "five to $1"
 msgstr "za pět $1"
 
-#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:66
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
 msgid "$1 o'clock"
 msgstr "$1 hodin"
 
-#: ../src/common/fuzzyclock.py:69
+#: ../src/common/fuzzyclock.py:64
 msgid "Night"
 msgstr "Noc"
 
-#: ../src/common/fuzzyclock.py:69
+#: ../src/common/fuzzyclock.py:64
 msgid "Early morning"
 msgstr "Brzy ráno"
 
-#: ../src/common/fuzzyclock.py:69
+#: ../src/common/fuzzyclock.py:64
 msgid "Morning"
 msgstr "Ráno"
 
-#: ../src/common/fuzzyclock.py:69
+#: ../src/common/fuzzyclock.py:64
 msgid "Almost noon"
 msgstr "Skoro poledne"
 
-#: ../src/common/fuzzyclock.py:70
+#: ../src/common/fuzzyclock.py:65
 msgid "Noon"
 msgstr "Poledne"
 
-#: ../src/common/fuzzyclock.py:70
+#: ../src/common/fuzzyclock.py:65
 msgid "Afternoon"
 msgstr "Odpoledne"
 
-#: ../src/common/fuzzyclock.py:70
+#: ../src/common/fuzzyclock.py:65
 msgid "Evening"
 msgstr "Večer"
 
-#: ../src/common/fuzzyclock.py:70
+#: ../src/common/fuzzyclock.py:65
 msgid "Late evening"
 msgstr "Pozdě večer"
 
-#: ../src/common/fuzzyclock.py:72
+#: ../src/common/fuzzyclock.py:67
 msgid "Start of week"
 msgstr "Začátek týdne"
 
-#: ../src/common/fuzzyclock.py:72
+#: ../src/common/fuzzyclock.py:67
 msgid "Middle of week"
 msgstr "Uprostřed týdne"
 
-#: ../src/common/fuzzyclock.py:72
+#: ../src/common/fuzzyclock.py:67
 msgid "End of week"
 msgstr "Konec týdne"
 
-#: ../src/common/fuzzyclock.py:73
+#: ../src/common/fuzzyclock.py:68
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:139
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:144
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:149
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:155
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:263 ../src/features_window.py:116
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:316
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:319
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:321
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:381
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:383
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:385
+#: ../src/common/helpers.py:405
 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:388
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
-#: ../src/common/helpers.py:970 ../src/common/helpers.py:977
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4825,22 +4908,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: ../src/common/helpers.py:983
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr "z místností %s"
 
-#: ../src/common/helpers.py:986 ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr "od uživatele %s"
 
-#: ../src/common/helpers.py:988
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1002
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4848,548 +4931,695 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: ../src/common/helpers.py:1035
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:65
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:221 ../src/common/optparser.py:222
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:338
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
-#: ../src/common/passwords.py:86
+#: ../src/common/passwords.py:92
 #, python-format
 msgid "Gajim account %s"
 msgstr "Gajim účet %s"
 
-#: ../src/common/pep.py:4
+#: ../src/common/pep.py:29
 msgid "Afraid"
 msgstr "Vylekaný"
 
-#: ../src/common/pep.py:4
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Užaslý"
 
-#: ../src/common/pep.py:5
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Vzrušený"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#: ../src/common/pep.py:5
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: ../src/common/pep.py:6
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: ../src/common/pep.py:6
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Vzrušený"
 
-#: ../src/common/pep.py:7
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: ../src/common/pep.py:7
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Znuděný"
 
-#: ../src/common/pep.py:8
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Statečný"
 
-#: ../src/common/pep.py:8
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Klidný"
 
-#: ../src/common/pep.py:9
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Zvědavý"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Chladný"
 
-#: ../src/common/pep.py:9
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Obsah"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Zmatený"
 
-#: ../src/common/pep.py:10
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Spokojený"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Spokojený"
 
-#: ../src/common/pep.py:10
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Potrhlý"
 
-#: ../src/common/pep.py:11
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Potrhlý"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Neaktivní"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Zvědavý"
 
-#: ../src/common/pep.py:11
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Smazat"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Deprimovaný"
 
-#: ../src/common/pep.py:12
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Zklamaný"
 
-#: ../src/common/pep.py:12
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Znechucený"
 
-#: ../src/common/pep.py:13
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Vypnuto"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Roztržitý"
 
-#: ../src/common/pep.py:13
-msgid "Embarassed"
+#: ../src/common/pep.py:56
+#, fuzzy
+msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: ../src/common/pep.py:14
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Znepokojený"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Nadšený"
 
-#: ../src/common/pep.py:14
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Záletný"
 
-#: ../src/common/pep.py:15
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Rozčarovaný"
 
-#: ../src/common/pep.py:15
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Řídím"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Nevrlý"
 
-#: ../src/common/pep.py:16
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Provinilý"
 
-#: ../src/common/pep.py:16
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:17
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Vášnivý"
 
-#: ../src/common/pep.py:17
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Pokorný"
 
-#: ../src/common/pep.py:18
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Ponížený"
 
-#: ../src/common/pep.py:18
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Hladový"
 
-#: ../src/common/pep.py:19
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Raněný"
 
-#: ../src/common/pep.py:19
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: ../src/common/pep.py:20
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "S respektem"
 
-#: ../src/common/pep.py:20
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Zamilovaný"
 
-#: ../src/common/pep.py:21
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Rozhořčený"
 
-#: ../src/common/pep.py:21
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Zaujatý"
 
-#: ../src/common/pep.py:22
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Opilý/Zfetovaný"
 
-#: ../src/common/pep.py:22
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Nepřekonatelný"
 
-#: ../src/common/pep.py:23
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#: ../src/common/pep.py:23
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Osamělý"
 
-#: ../src/common/pep.py:24
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Počítač:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Lakomý"
 
-#: ../src/common/pep.py:24
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Náladový"
 
-#: ../src/common/pep.py:25
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nervózní"
 
-#: ../src/common/pep.py:25
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutrální"
 
-#: ../src/common/pep.py:26
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Uražený"
 
-#: ../src/common/pep.py:26
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Rozčarovaný"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Hravý"
 
-#: ../src/common/pep.py:27
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Hrdý"
 
-#: ../src/common/pep.py:27
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Uvolněný"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Uvolněný"
 
-#: ../src/common/pep.py:28
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Kajícný"
 
-#: ../src/common/pep.py:28
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Netrpělivý"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Smutný"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Jízlivý"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Naposledy upraveno:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Vážný"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Plachý"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Nemocný"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Ospalý"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Stresovaný"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Překvapený"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Žíznivý"
 
-#: ../src/common/pep.py:34
-msgid "Thoughtful"
-msgstr "Zamyšlený"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Čas"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "devět"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Ustaraný"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Domácí práce"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Nakupuji potraviny"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Uklízím"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Vařím"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Dělám údržbu"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Umývám nádobí"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Peru"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Zahradničím"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Vyřizuji"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "venčím psa"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Piju"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Na pivě"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Na kávě"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Dávám si čaj"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Svačím"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Snídám"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Večeřím"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Obědvám"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: ../src/common/pep.py:60 ../src/common/pep.py:99
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Jezdím na kole"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Uklízím"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Na výšlapu"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Sportuji"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Běhám"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Lyžuji"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Plavu"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Posiluji"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Pečuji o sebe"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "V lázních"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "U holiče"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Holím se"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Koupu se"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Sprchuji se"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Mám schůzku"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Den volna"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Venku za zábavou"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Na výšlapu"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "Na dovolené"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Na párty"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolená"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Piju"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Relaxuji"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Na výšlapu"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Hraji hry"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Venku"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Na párty"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Čtu si"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Nacvičuji"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Nakupuji"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Lyžuji"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Ve společnosti"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Opaluji se"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Sleduji TV"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Dívám se na film"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Povídám si"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "Ve skutečném světě"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Telefonuji"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Cestuji"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Dojíždím"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Řídím"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "V autě"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "V letadle"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "Ve vlaku"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "Na výletě"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Na procházce"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Programuji"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "Na setkání"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Studuji"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Píši"
 
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Nemohu naslouchat na portu %s."
+
+#: ../src/common/socks5.py:85
+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:257
+#: ../src/common/stanza_session.py:278
 #, fuzzy
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
@@ -5481,40 +5711,40 @@ msgstr "Kontakt je offline. Vaše zpráva nemohla být odeslána."
 msgid "Error while adding service. %s"
 msgstr "Chyba při přidávání služby. %s"
 
-#: ../src/config.py:140 ../src/config.py:566
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:311
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:319
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:395
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Výchozí Zpráva"
 
-#: ../src/config.py:402
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:444
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Vždy použít OS/X výchozí aplikace"
 
-#: ../src/config.py:445
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../src/config.py:635 ../src/dialogs.py:1203
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:636
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5523,247 +5753,247 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/config.py:1001
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1001
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:1039
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:1041
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:1042
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:1043
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
 #. Name column
-#: ../src/config.py:1304 ../src/dialogs.py:1817 ../src/dialogs.py:1881
-#: ../src/disco.py:752 ../src/disco.py:1544 ../src/disco.py:1790
-#: ../src/history_window.py:90
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1387
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1406
 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:1517 ../src/config.py:1616
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1652 ../src/config.py:1693
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1653
+#: ../src/config.py:1667
 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:1679
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1694
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: ../src/config.py:1689
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1690
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1694
+#: ../src/config.py:1710
 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:1700
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1701
+#: ../src/config.py:1717
 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:1705 ../src/config.py:1709
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1781
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:1782
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:1800 ../src/config.py:1808 ../src/config.py:1850
-#: ../src/config.py:3076 ../src/dataforms_widget.py:535
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1809
+#: ../src/config.py:1828
 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:1997 ../src/config.py:3148
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1998 ../src/config.py:3149
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2019 ../src/config.py:3629
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2020 ../src/config.py:3630
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:2023 ../src/config.py:3633
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2024 ../src/config.py:3634
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2064
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2089
 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:2072 ../src/dialogs.py:1669 ../src/dialogs.py:1805
-#: ../src/dialogs.py:1985 ../src/disco.py:435 ../src/profile_window.py:318
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2077
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2078
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2109
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2110
+#: ../src/config.py:2134
 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:2293
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2295
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2331
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2334
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2383 ../src/disco.py:759 ../src/history_manager.py:178
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2391
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2400
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2425
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2427
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5771,37 +6001,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2429
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2430
+#: ../src/config.py:2454
 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:2432
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2433
+#: ../src/config.py:2457
 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:2435
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2436
+#: ../src/config.py:2460
 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:2437
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5818,85 +6048,85 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2543
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2565 ../src/gajim.py:1389 ../src/roster_window.py:1947
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2566 ../src/roster_window.py:1921
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2567 ../src/roster_window.py:1948
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2576
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2577
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:2673
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:2744
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:2777
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2792
 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:3059
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3061
+#: ../src/config.py:3074
 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:3087
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Dvakrát použité Jabber ID"
 
-#: ../src/config.py:3088
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už je nastaven v Gajimu."
 
-#: ../src/config.py:3105
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3106 ../src/config.py:3293
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5905,24 +6135,24 @@ 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:3124
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3125
+#: ../src/config.py:3138
 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:3176 ../src/gajim.py:1949
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3177 ../src/gajim.py:1950
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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:3245
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -5937,7 +6167,7 @@ msgstr ""
 "SSL Chyba: %(error)s\n"
 "Přesto se chcete připojit na tento server?"
 
-#: ../src/config.py:3251 ../src/gajim.py:1973
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -5948,257 +6178,259 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3272 ../src/config.py:3311
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3292
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3395
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3396
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/conversation_textview.py:528
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:627
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:639
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:644
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:661
+#: ../src/conversation_textview.py:712
 #, 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:674
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:677
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:683
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
-#: ../src/conversation_textview.py:1172
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "chyba při odesílání %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1176
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1210
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dataforms_widget.py:539
+#: ../src/dataforms_widget.py:540
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je již na seznamu"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID je již na seznamu. Vyberte jiné."
 
 #. Default jid
-#: ../src/dataforms_widget.py:551
+#: ../src/dataforms_widget.py:552
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:554 ../src/dataforms_widget.py:556
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:72
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:74
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:445
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Nastavit Náladu"
 
-#: ../src/dialogs.py:533
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:535
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:636
-msgid "Save as Preset Status Message"
-msgstr "Uložit jako přednastavený stav"
-
-#: ../src/dialogs.py:637
-msgid "Please type a name for this status message"
-msgstr "Napište jméno pro tento stav"
-
-#: ../src/dialogs.py:648
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: ../src/dialogs.py:649
+#: ../src/dialogs.py:673
 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:665
+#: ../src/dialogs.py:682
+msgid "Save as Preset Status Message"
+msgstr "Uložit jako přednastavený stav"
+
+#: ../src/dialogs.py:683
+msgid "Please type a name for this status message"
+msgstr "Napište jméno pro tento stav"
+
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:666
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:667
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:706
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:708
+#: ../src/dialogs.py:731
 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:865 ../src/dialogs.py:871 ../src/dialogs.py:876
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:877
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:892
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:928
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:986
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:987
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:988
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:998
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1035
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1196
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nemohu naslouchat na portu %s."
-
-#: ../src/dialogs.py:1197
-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."
-
-#: ../src/dialogs.py:1204
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6209,88 +6441,88 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/dialogs.py:1598
+#: ../src/dialogs.py:1614
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Žádost o autorizaci pro účet %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1601
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:1662 ../src/gajim.py:2555
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:1670
+#: ../src/dialogs.py:1686
 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:1689
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:1760
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:1761 ../src/groupchat_control.py:1328
-#: ../src/groupchat_control.py:1600
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1765 ../src/dialogs.py:1771
-#: ../src/groupchat_control.py:1765
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:1766 ../src/dialogs.py:1772
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1778
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:1779
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:1806
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1820
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1853
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:1854
+#: ../src/dialogs.py:1870
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:1878
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:1938
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:1939
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6298,335 +6530,385 @@ msgstr ""
 "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1964 ../src/dialogs.py:2340 ../src/dialogs.py:2482
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:1965 ../src/dialogs.py:2341 ../src/dialogs.py:2483
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, 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:1974 ../src/dialogs.py:1977
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:1977
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:1986
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2004
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2005
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2009
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2025
 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:2054 ../src/notify.py:242 ../src/notify.py:456
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:2056 ../src/notify.py:250 ../src/notify.py:458
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:273 ../src/notify.py:460
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:254 ../src/notify.py:460
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:261 ../src/notify.py:461
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1554 ../src/notify.py:469
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1620 ../src/notify.py:463
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1519 ../src/gajim.py:1587
-#: ../src/notify.py:465 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1659 ../src/gajim.py:1681
-#: ../src/gajim.py:1698 ../src/notify.py:467 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1662 ../src/notify.py:467
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1410 ../src/notify.py:471
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:2070 ../src/notify.py:234 ../src/notify.py:473
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:2259
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2261
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2266
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2289
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2312
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2383
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2384
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:2428
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:2553
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2557
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:2613
+#: ../src/dialogs.py:2628
 #, 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:2618
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:2660
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:2747
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:2845
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:2915
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:2916
+#: ../src/dialogs.py:2931
 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:2949
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:2952
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:2968
 #, 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:2962
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:2964
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:3019
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:3029 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:3034
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:3067
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:3085
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3150
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:3152
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
 #. # means number
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "č."
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:3347
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/dialogs.py:3817
-#, python-format
+#: ../src/dialogs.py:3836
+#, fuzzy, python-format
 msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
 "\n"
-"This session's Short Authentication String is: %(sas)s"
+"This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 "Vaš rozhovor s %(jid)s je šifrovaný.\n"
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: %(sas)s"
 
-#: ../src/dialogs.py:3820
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:3835
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+#, fuzzy
+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 pouze důvěryhodné osoby mohou číst vaše zprávy "
+"nebo vám poslat zprávu, je potřeba ověřit jejich identitu"
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+#, fuzzy
+msgid "Have you verified the contact's identity?"
 msgstr "Chcete ověřit identitu kontaktu?"
 
-#: ../src/dialogs.py:3836
-#, python-format
+#: ../src/dialogs.py:3882
+#, fuzzy, python-format
 msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"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: <b>%(sas)s</b>"
+"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 %(jid)s "
 "(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:3837
+#: ../src/dialogs.py:3883
 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/disco.py:112
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "Klíč kontaktu (%s) se neshoduje s klíčem v Gajimu."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:116
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:436
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:510
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:652
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:653
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -6634,198 +6916,204 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:657 ../src/disco.py:939
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:658
+#: ../src/disco.py:662
 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:738
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Neplatný server"
+
+#: ../src/disco.py:754
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: ../src/disco.py:778
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:940
+#: ../src/disco.py:956
 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:1161
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
-#: ../src/disco.py:1171 ../src/disco.py:1335
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1372
+#: ../src/disco.py:1390
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skenuji %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1554
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1562
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1570
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1799
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:1807
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:1864
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:1870
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:1876
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:51
 msgid "PyOpenSSL"
 msgstr "PyOpenSSL"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:52
 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:48 ../src/features_window.py:49
+#: ../src/features_window.py:53 ../src/features_window.py:54
 msgid "Requires python-pyopenssl."
 msgstr "Je potřeba python-pyopenssl."
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:55
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:56
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverless automaticky komunikuje s klienty detekovanými v místní síti."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:57
 msgid "Requires python-avahi."
 msgstr "Je potřeba python-avahi."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:58
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Je potřeba pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:59
 msgid "gajim-remote"
 msgstr "gajim-remote"
 
-#: ../src/features_window.py:55
-msgid "A script to controle Gajim via commandline."
+#: ../src/features_window.py:60
+#, fuzzy
+msgid "A script to control Gajim via commandline."
 msgstr "Skript, který ovládá Gajim s příkazové řádky."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:61
 msgid "Requires python-dbus."
 msgstr "Je potřeba python-dbus."
 
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85 ../src/features_window.py:97
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Vlastnost není k dispozici pod Windows."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:63
 msgid "OpenGPG"
 msgstr "OpenGPG"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:64
 msgid "Encrypting chatmessages with gpg keys."
 msgstr "Šifruje zprávy gpg klíčem."
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:65
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Je potřeba gpg a python-GnuPGInterface."
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:67
 msgid "network-manager"
 msgstr "Správce sítě (network-manager)"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:68
 msgid "Autodetection of network status."
 msgstr "Autodetekce stavu sítě."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:69
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Je potřeba gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:71
 msgid "Session Management"
 msgstr "Správa Sezení"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:72
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sezení Gajimu je uloženo při odhlášení a znovu načteno při přihlášení."
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:73
 msgid "Requires python-gnome2."
 msgstr "Je potřeba python-gnome2."
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:75
 msgid "gnome-keyring"
 msgstr "gnome-keyring"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:76
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslo může být bezpečně uloženo."
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:77
 msgid "Requires gnome-keyring and python-gnome2-desktop."
 msgstr "Je potřeba gnome-keyring a python-gnome2-desktop."
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:79
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:80
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Schopnost připojit se na servery používající SRV záznamy."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:81
 msgid "Requires dnsutils."
 msgstr "Je potřeba dnsutils."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:82
 msgid "Requires nslookup to use SRV records."
 msgstr "Je potřeba nslookup pro použití SRV záznamů."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:83
 msgid "Spell Checker"
 msgstr "Kontrola Pravopisu"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:84
 msgid "Spellchecking of composed messages."
 msgstr "Kontrola Pravopisu psaných zpráv."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:85
 msgid ""
 "Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
 "sources."
@@ -6833,85 +7121,95 @@ msgstr ""
 "Je potřeba python-gnome2-extras nebo zkompilovaný gtkspell modul ze zdrojáků "
 "Gajima."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:87
 msgid "Notification-daemon"
 msgstr "Notification-daemon"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:88
 msgid "Passive popups notifying for new events."
 msgstr "Pasivní okna oznamující nové události."
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:89
 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:86
+#: ../src/features_window.py:91
 msgid "Trayicon"
 msgstr "Tray ikona"
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:92
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ikona v systémové liště zobrazující aktuální stav."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:93
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Je potřeba python-gnome2-extras nebo zkompilovaný trayicon modul ze zdrojáků "
 "Gajima."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:94
 msgid "Requires PyGTK >= 2.10."
 msgstr "Je potřeba PyGTK verze 2.10. nebo vyšší."
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:95
 msgid "Idle"
 msgstr "Nečinný"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:96
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Funkce pro měření času nečinnosti pro nastavení automatického stavu."
 
-#: ../src/features_window.py:92 ../src/features_window.py:93
+#: ../src/features_window.py:97 ../src/features_window.py:98
 msgid "Requires compilation of the idle module from Gajim sources."
 msgstr "Je potřeba zkompilovat idle modul ze zdrojáků Gajima."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:99
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:100
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Převede LaTeX výraz mezi $$ $$."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:101
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"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, dvips a imagemagick. Dále musíte nastavit "
+"'use_latex' na True v Editoru rozšířeného nastavení."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Je potřeba texlive-latex-base, dvips a imagemagick. Dále musíte nastavit "
 "'use_latex' na True v Editoru rozšířeného nastavení."
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:103
 msgid "End to End Encryption"
 msgstr "PGP Šifrování"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:104
 msgid "Encrypting chatmessages."
 msgstr "Šifrované zprávy."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:105 ../src/features_window.py:106
 msgid "Requires python-crypto."
 msgstr "Je potřeba python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:107
 msgid "RST Generator"
 msgstr "RST Generátor"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:108
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -6919,125 +7217,125 @@ msgstr ""
 "Generuje XHTML výstup pro RST kód (viz.: http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:110
 msgid "Requires python-docutils."
 msgstr "Je potřeba python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:111
 msgid "libsexy"
 msgstr "libsexy"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:112
 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:108 ../src/features_window.py:109
+#: ../src/features_window.py:113 ../src/features_window.py:114
 msgid "Requires python-sexy."
 msgstr "Je potřeba python-sexy."
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:128
 msgid "Feature"
 msgstr "Vlastnost"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:165 ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:174 ../src/filetransfers_window.py:184
-#: ../src/history_manager.py:486
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:175
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:594
-#: ../src/tooltips.py:666
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/filetransfers_window.py:187
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:210
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/filetransfers_window.py:222
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Přenos souboru byl ukončen protistranou"
 
-#: ../src/filetransfers_window.py:243
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:259 ../src/tooltips.py:706
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 #, fuzzy
 msgid "Description: "
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:271
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:302
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:307
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
@@ -7046,42 +7344,42 @@ msgstr "Popis: %s"
 # #, python-format
 # msgid "Description: %s"
 # msgstr "Popis: %s"
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:783
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: ../src/filetransfers_window.py:324 ../src/gtkgui_helpers.py:785
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:331 ../src/gtkgui_helpers.py:789
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:331 ../src/gtkgui_helpers.py:789
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:345 ../src/gtkgui_helpers.py:799
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:345 ../src/gtkgui_helpers.py:800
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
@@ -7096,67 +7394,67 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:524
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:564 ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:564
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:590 ../src/tooltips.py:656
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:780
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:72
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
-#: ../src/gajim.py:145
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vyžaduje k běhu X server. Končím..."
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:186
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější"
 
-#: ../src/gajim.py:176
+#: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější. Končím..."
 
-#: ../src/gajim.py:178
+#: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim potřebuje GTK 2.8 nebo novější"
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.8 nebo novější. Končím..."
 
 # FIXME: runtime je jak?
-#: ../src/gajim.py:184
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:186
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7165,21 +7463,21 @@ msgstr ""
 "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
 "verzi z %s"
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:199
 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:193
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potřebuje k běhu pywin32"
 
-#: ../src/gajim.py:202
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7189,11 +7487,11 @@ msgstr ""
 "získat na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:352
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:353
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7201,68 +7499,79 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim.py:467
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/gajim.py:468
+#: ../src/gajim.py:494
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Zadej heslo GPG klíče %(keyid)s (účet %(account)s)."
 
 #. ask again
-#: ../src/gajim.py:483
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"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"
+"Níže vyber jinou přezdívku:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: ../src/gajim.py:549
+#: ../src/gajim.py:576
 #, 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/gajim.py:597 ../src/notify.py:475 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gajim.py:901 ../src/gajim.py:905
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:915 ../src/gajim.py:928
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:959
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:960
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: ../src/gajim.py:979
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gajim.py:980
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7270,67 +7579,72 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: ../src/gajim.py:1021
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:1200 ../src/groupchat_control.py:1065
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
-#: ../src/gajim.py:1215 ../src/groupchat_control.py:1215
-#: ../src/history_window.py:410 ../src/notify.py:229
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1337 ../src/groupchat_control.py:1025
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
-#: ../src/gajim.py:1340
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: ../src/gajim.py:1342
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: ../src/gajim.py:1345
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastala změna nastavení netýkající se soukromí"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1348
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávání historie je zapnuto"
 
-#: ../src/gajim.py:1350
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávání historie je vypnuto"
 
-#: ../src/gajim.py:1352
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: ../src/gajim.py:1355
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: ../src/gajim.py:1358
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1422
 #, 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."
 
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7338,20 +7652,20 @@ msgstr ""
 "Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
 "spuštěný nebo vrátil chybné heslo.\n"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:1530
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1532
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7359,7 +7673,7 @@ msgstr[0] "Máte %d nepřečtený E-mail"
 msgstr[1] "Máte %d nepřečtené E-maily"
 msgstr[2] "Máte %d nepřečtených E-mailů"
 
-#: ../src/gajim.py:1546
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7374,34 +7688,34 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1617
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1682
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
 
 #. ft stopped
-#: ../src/gajim.py:1686
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/gajim.py:1699
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1703
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gajim.py:1789
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7410,46 +7724,46 @@ msgstr ""
 "Nepodařilo se dešifrovat zprávu od %s\n"
 "Možná je falešná."
 
-#: ../src/gajim.py:1796
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: ../src/gajim.py:1858
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gajim.py:1859
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: ../src/gajim.py:1876
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1885
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1891
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gajim.py:1916
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: ../src/gajim.py:1917
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
 
-#: ../src/gajim.py:1970
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: ../src/gajim.py:1971
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7459,15 +7773,15 @@ msgstr ""
 "Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
 "Chcete se přesto připojit?"
 
-#: ../src/gajim.py:1976
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: ../src/gajim.py:1991
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gajim.py:1992
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7483,11 +7797,11 @@ msgstr ""
 "\n"
 "Chcete se stále připojit a aktualizovat otisk certifikátu?"
 
-#: ../src/gajim.py:2014 ../src/gajim.py:2044
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: ../src/gajim.py:2015
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7495,16 +7809,16 @@ msgstr ""
 "Snažíte se poslat vaše heslo nezabezpečeným spojením. Jste si jisti, že to "
 "skutečně chcete udělat?"
 
-#: ../src/gajim.py:2017 ../src/gajim.py:2047
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: ../src/gajim.py:2018 ../src/gajim.py:2048 ../src/groupchat_control.py:1692
-#: ../src/roster_window.py:3813
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/gajim.py:2045
+#: ../src/gajim.py:2089
 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?"
@@ -7512,21 +7826,21 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "PEP uzel nebyl smazán"
 
-#: ../src/gajim.py:2063
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2513 ../src/gajim.py:2534
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/gajim.py:2514
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7534,7 +7848,7 @@ msgstr ""
 "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
 "vypnuty "
 
-#: ../src/gajim.py:2535
+#: ../src/gajim.py:2594
 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 "
@@ -7544,64 +7858,56 @@ msgstr ""
 "aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
 "Emoticons "
 
-#: ../src/gajim.py:2561 ../src/roster_window.py:3341
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2842
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:2939
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/gajim.py:2940
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
 
-#: ../src/gajim.py:2953
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/gajim.py:2954
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
 
-#: ../src/gajim.py:3141
-msgid "Network Manager support not available"
-msgstr "Podpora Network Manageru není dostupná"
-
-#: ../src/gajim.py:3265
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
-
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Zobrazí nápovědu pro konkrétní příkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7609,48 +7915,48 @@ msgstr ""
 "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
 "samostatném řádku"
 
-#: ../src/gajim-remote.py:93 ../src/gajim-remote.py:108
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:154
-#: ../src/gajim-remote.py:175 ../src/gajim-remote.py:205
-#: ../src/gajim-remote.py:214 ../src/gajim-remote.py:221
-#: ../src/gajim-remote.py:228 ../src/gajim-remote.py:239
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:107 ../src/gajim-remote.py:128
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "zpráva"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "text stavu"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7658,19 +7964,19 @@ 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:114
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:205
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:128
 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 "
@@ -7680,29 +7986,29 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:129 ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:129 ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 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:131 ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 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:136
+#: ../src/gajim-remote.py:141
 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 "
@@ -7712,135 +8018,135 @@ msgstr ""
 "jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', "
 "nastavte prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "předmět"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Poslat novou zprávu do diskuze ke které jste připojeni."
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:174
-#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Přidá nový kontakt do tohoto účtu"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:224
 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:226
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vrací aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otevře dialog 'Začít rozhovor'"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Začít rozhovor z tohoto účtu"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML k odeslání"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -7848,68 +8154,68 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsluhovat xmpp:/ uri"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:259
 #, fuzzy
 msgid "URI to handle"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Účet s kterým chcete manipulovat"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "místnost"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "JID Místnosti"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Heslo pro vstup do místnosti"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Účet z kterého chcete vstoupit do místnosti"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: ../src/gajim-remote.py:274 ../src/gajim-remote.py:284
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7918,15 +8224,15 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:380
 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:412
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7935,16 +8241,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7953,7 +8259,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:497
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -7962,7 +8268,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:502
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -7971,157 +8277,177 @@ msgstr ""
 "Parametry \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:521
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Nesprávné uri"
 
-#: ../src/gajim_themes_window.py:67
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Téma"
 
-#: ../src/gajim_themes_window.py:105
+#: ../src/gajim_themes_window.py:97
 msgid "You cannot make changes to the default theme"
 msgstr "Nemůžete měnit výchozí téma"
 
-#: ../src/gajim_themes_window.py:106
+#: ../src/gajim_themes_window.py:98
 msgid "Please create a clean new theme with your desired name."
 msgstr "Vytvořte vaše nové téma."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:180
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "jméno tématu"
 
-#: ../src/gajim_themes_window.py:197
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Nemůžete smazat právě používané téma"
 
-#: ../src/gajim_themes_window.py:198
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:146
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:148
+#: ../src/groupchat_control.py:152
 #, 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:384
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:536
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:538
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
-#: ../src/groupchat_control.py:953
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1028
 #, 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."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1132
 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:1039
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1043
+#: ../src/groupchat_control.py:1142
 #, 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:1050
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1054
+#: ../src/groupchat_control.py:1153
 #, 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:1063
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:1100 ../src/groupchat_control.py:1104
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1101
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1111
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s byli vyhozeni: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1327 ../src/groupchat_control.py:1599
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/groupchat_control.py:1351 ../src/groupchat_control.py:1369
-#: ../src/groupchat_control.py:1453 ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Místnost nemá žádné téma"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
-#: ../src/groupchat_control.py:1526
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8133,7 +8459,7 @@ msgstr ""
 "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
 "právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1533
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8142,7 +8468,7 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8151,7 +8477,7 @@ msgstr ""
 "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
 "byl uveden."
 
-#: ../src/groupchat_control.py:1545
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8160,7 +8486,7 @@ msgstr ""
 "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
 "důvodem."
 
-#: ../src/groupchat_control.py:1549
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8169,7 +8495,7 @@ msgstr ""
 "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
 "místnost@server, případně s uvedenou přezdívkou."
 
-#: ../src/groupchat_control.py:1553
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8179,7 +8505,7 @@ msgstr ""
 "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
 "místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1562
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8188,61 +8514,61 @@ msgstr ""
 "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle "
 "zprávu nájemníkovi určeném přezdívkou."
 
-#: ../src/groupchat_control.py:1567
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#: ../src/groupchat_control.py:1571
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
 
-#: ../src/groupchat_control.py:1575
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1578
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
 
-#: ../src/groupchat_control.py:1686
+#: ../src/groupchat_control.py:1837
 #, 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:1688
+#: ../src/groupchat_control.py:1839
 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:1724
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1725
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1736
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1737
+#: ../src/groupchat_control.py:1882
 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:1752
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8250,22 +8576,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1755
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1941
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1942 ../src/groupchat_control.py:2242
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2241
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -8290,86 +8616,86 @@ msgid "Details"
 msgstr "Detaily"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:162 ../src/gtkgui_helpers.py:177
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:352
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:355
+#: ../src/gtkgui_helpers.py:359
 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:392
+#: ../src/gtkgui_helpers.py:396
 #, 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:729
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:731
+#: ../src/gtkgui_helpers.py:735
 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:828
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../src/gtkgui_helpers.py:829
+#: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:838
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
-#: ../src/history_manager.py:91
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
 #. holds jid
-#: ../src/history_manager.py:131
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:144 ../src/history_manager.py:184
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:150 ../src/history_manager.py:202
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. holds message
-#: ../src/history_manager.py:158 ../src/history_manager.py:190
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../src/history_manager.py:210
+#: ../src/history_manager.py:224
 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:212
+#: ../src/history_manager.py:226
 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 "
@@ -8383,121 +8709,126 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: ../src/history_manager.py:424
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../src/history_manager.py:499
+#: ../src/history_manager.py:512
 #, 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:536
+#: ../src/history_manager.py:549
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
 msgstr[1] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:540 ../src/history_manager.py:575
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: ../src/history_manager.py:572
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] ""
 
-#: ../src/history_window.py:288
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: ../src/history_window.py:406
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Chyba zápisu na disk"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:416
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:419
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: ../src/htmltextview.py:587 ../src/htmltextview.py:598
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/htmltextview.py:608
+#: ../src/htmltextview.py:612
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: ../src/message_window.py:394
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:396
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/message_window.py:398
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:404
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../src/negotiation.py:13
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- zprávy budou zaznamenány"
 
-#: ../src/negotiation.py:15
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- zprvý nebudou zaznamenány"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: ../src/notify.py:237
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: ../src/notify.py:245
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: ../src/notify.py:257
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: ../src/notify.py:265
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová soukromá zpráva z místnosti %s"
 
-#: ../src/notify.py:267
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/notify.py:276
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
@@ -8506,84 +8837,84 @@ msgstr "Nová zpráva od %(nickname)s"
 msgid "Generic"
 msgstr "Obecné"
 
-#: ../src/profile_window.py:54
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:107 ../src/roster_window.py:2815
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2818
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:124 ../src/profile_window.py:140
-#: ../src/roster_window.py:2820 ../src/roster_window.py:2831
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/profile_window.py:250
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informace přijata"
 
-#: ../src/profile_window.py:319
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: ../src/profile_window.py:333
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Odesílám profil..."
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informace NEBYLY zveřejněny"
 
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/profile_window.py:356
+#: ../src/profile_window.py:358
 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:293 ../src/roster_window.py:972
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1864
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1865
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1886
+#: ../src/roster_window.py:1882
 #, 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:1898
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1895
 #, 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:1924
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8591,15 +8922,15 @@ msgstr ""
 "Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
 "není asi správně nastavena)"
 
-#: ../src/roster_window.py:1934 ../src/roster_window.py:1954
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:2110 ../src/roster_window.py:3258
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2111 ../src/roster_window.py:3259
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8608,15 +8939,15 @@ msgstr ""
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: ../src/roster_window.py:2137
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2260 ../src/roster_window.py:2505
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2261
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8624,16 +8955,16 @@ msgstr ""
 "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
 "historii a kontakt bude ve vašem rosteru."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2522
 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:2509
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8641,11 +8972,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8655,51 +8986,52 @@ msgstr ""
 "transportů:%s"
 
 #. it's jid
-#: ../src/roster_window.py:2697
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2698
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2754
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2755
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2756
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+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:2780
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3155
+#: ../src/roster_window.py:3128
 #, 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:3159
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8707,7 +9039,13 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:3164
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Chcete přijmout pozvání?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8715,16 +9053,16 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:3167
+#: ../src/roster_window.py:3144
 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:3171
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3175
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8733,20 +9071,20 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: ../src/roster_window.py:3214
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3215
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:3727
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:3729
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -8754,12 +9092,12 @@ msgstr ""
 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
 "přístím připojení uloženy."
 
-#: ../src/roster_window.py:3807
+#: ../src/roster_window.py:3784
 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:3809
+#: ../src/roster_window.py:3786
 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 "
@@ -8769,14 +9107,14 @@ msgstr ""
 "jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
 "transportech."
 
-#: ../src/roster_window.py:3922
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:3933
-#, python-format
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s Vám chce poslat soubor:"
 msgstr[1] "%s Vám chce poslat soubory:"
 msgstr[2] "%s Vám chce poslat soubory:"
@@ -8786,162 +9124,162 @@ msgstr[2] "%s Vám chce poslat soubory:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4605 ../src/roster_window.py:4676
-#: ../src/roster_window.py:4685 ../src/systray.py:215 ../src/systray.py:220
-#: ../src/systray.py:226
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4692
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4697
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:4737
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4756
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4796
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:4858 ../src/roster_window.py:4967
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:4885
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:4892
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Nálada"
 
-#: ../src/roster_window.py:4896
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Činnost"
 
-#: ../src/roster_window.py:4901
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
 #. Send Group Message
-#: ../src/roster_window.py:5063 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5071
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5075
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: ../src/roster_window.py:5469
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5587
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
 #. Send single message
-#: ../src/roster_window.py:5648
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5704
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5712
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5794
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
-#: ../src/roster_window.py:5874
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Nová diskuze"
 
 #. History manager
-#: ../src/roster_window.py:5977
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:5986
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 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:6196
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
 # FIXME: hmm kdovi co to je..
-#: ../src/search_window.py:91
+#: ../src/search_window.py:93
 msgid "Waiting for results"
 msgstr "Čekání na výsledky"
 
-#: ../src/search_window.py:131 ../src/search_window.py:209
+#: ../src/search_window.py:133 ../src/search_window.py:211
 msgid "Error in received dataform"
 msgstr "Chyba v příchozím datagramu"
 
 #. No result
-#: ../src/search_window.py:165 ../src/search_window.py:201
+#: ../src/search_window.py:167 ../src/search_window.py:203
 msgid "No result"
 msgstr "Žádný výsledek"
 
-#: ../src/session.py:99
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Chyba zápisu na disk"
 
-#: ../src/session.py:209
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
-#: ../src/session.py:369 ../src/session.py:407
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
-#: ../src/session.py:370
-#, python-format
+#: ../src/session.py:400
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t\t%s\n"
+"\t%s\n"
 "\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
 msgstr ""
 "Vzdálený klient chce navázat spojení s těmito volbamy:\n"
 "\n"
@@ -8949,7 +9287,7 @@ msgstr ""
 "\n"
 "\t\tJsou tyto volby přijatelné?"
 
-#: ../src/session.py:408
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -8964,129 +9302,124 @@ msgstr ""
 "\n"
 "Pokračovat v komunikaci?"
 
-#: ../src/systray.py:172
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/systray.py:257
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../src/tooltips.py:320 ../src/tooltips.py:515
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:323 ../src/tooltips.py:519
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:328
+#: ../src/tooltips.py:335
 #, 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:425
+#: ../src/tooltips.py:432
 msgid " [blocked]"
 msgstr "[blokováno]"
 
-#: ../src/tooltips.py:429
+#: ../src/tooltips.py:436
 msgid " [minimized]"
 msgstr "[minimalizováno]"
 
-#: ../src/tooltips.py:444 ../src/tooltips.py:703
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:475
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslední stav: %s"
 
-#: ../src/tooltips.py:477
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:495
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Spojeno"
 
-#: ../src/tooltips.py:497
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Odpojenol"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:536
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:582
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Nálada:"
 
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Činnost:"
 
-#: ../src/tooltips.py:633
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Hudba:"
 
-#: ../src/tooltips.py:634
-#, python-format
-msgid "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-msgstr "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-
-#: ../src/tooltips.py:659
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../src/tooltips.py:665
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Nahrát"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:678
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:681 ../src/tooltips.py:702
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:687 ../src/tooltips.py:690
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:694
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pozastaveno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:698
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:736
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9094,54 +9427,105 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:237
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:239
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:264 ../src/vcard.py:274 ../src/vcard.py:473
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:303
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah:</b>"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:319
 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:313
+#: ../src/vcard.py:321
 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:315
+#: ../src/vcard.py:323
 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:317
+#: ../src/vcard.py:325
 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:324
+#: ../src/vcard.py:332
 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:326
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: ../src/vcard.py:331 ../src/vcard.py:368 ../src/vcard.py:498
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
+
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Přepnout Open_PGP šifrování"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%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.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E Šifrování zapnuto"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E Šifrování vypnuto"
+
+#~ msgid "Close"
+#~ msgstr "Zavřít"
+
+#~ msgid "Verify remote identity"
+#~ msgstr "Ověřit identitu"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a "
+#~ "v diskuzích"
+
+#~ msgid "A_ccounts"
+#~ msgstr "Úč_ty"
+
+#~ msgid "<b>\"%(title)s\"</b> by "
+#~ msgstr "<b>\"%(title)s\"</b> od"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "Uživatelské jméno pro Last.gm účet."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Zamyšlený"
+
+#~ 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)"
diff --git a/po/da.po b/po/da.po
index 38dab94d2..19f0b244e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 07:25+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-26 21:36+0200\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team: \n"
@@ -291,9 +291,9 @@ msgstr "Redigere Personlig Information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1030
-#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -302,11 +302,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2690
-#: ../src/roster_window.py:5168
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "General"
 
@@ -371,20 +371,20 @@ msgstr "Information om dig, som er gemt på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2051
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050
-#: ../src/config.py:3153 ../src/config.py:3221 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2758
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2769
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ingen"
 
@@ -549,7 +549,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -564,7 +564,7 @@ msgid "Mer_ge accounts"
 msgstr "Fle_t kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5120
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Om_døb"
 
@@ -783,7 +783,7 @@ msgid "All statuses"
 msgstr "Status For Alle"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:277
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Borte"
 
@@ -800,7 +800,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -809,7 +809,7 @@ msgid "Launch a command"
 msgstr "Kør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
@@ -987,7 +987,7 @@ msgid "Join _Group Chat"
 msgstr "Bliv med i en _Gruppe Samtale"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "_Tilføj til Kontaktliste..."
 
@@ -1039,10 +1039,10 @@ msgstr "_Tilføj til Kontaktliste"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historie"
 
@@ -1151,7 +1151,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Fortsæt"
 
@@ -1159,7 +1159,7 @@ msgstr "_Fortsæt"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Åbn folderen med filen"
 
@@ -1207,7 +1207,7 @@ msgstr "Gajim Tema Tilpasning"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
@@ -1315,7 +1315,7 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lav en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Fra"
 
@@ -1370,7 +1370,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søg Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Samtale Historie"
 
@@ -1393,7 +1393,7 @@ msgstr "Søg:"
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1696
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
@@ -1420,8 +1420,8 @@ msgstr "For nylig:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182
-#: ../src/disco.py:1603
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Bliv med:"
 
@@ -1522,7 +1522,8 @@ 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 (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Ændre emne for rummet (Ctrl+N)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1552,7 +1553,7 @@ msgstr "Vis kontaktens profil (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Send"
 
@@ -1717,10 +1718,6 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Følelsesikoner:"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1730,7 +1727,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "vise i samtalevinduerne."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1740,7 +1737,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "sende til modparten."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1748,31 +1745,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:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Skjul alle knapperne i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 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:53
+#: ../data/glade/preferences_window.glade.h:52
 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:54
+#: ../data/glade/preferences_window.glade.h:53
 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:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1780,7 +1777,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:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1788,7 +1785,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1796,23 +1793,23 @@ msgstr ""
 "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
 "kontaktvinduet og i gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
 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:59
+#: ../data/glade/preferences_window.glade.h:58
 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:60
+#: ../data/glade/preferences_window.glade.h:59
 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:61
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1822,7 +1819,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:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1832,7 +1829,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:63
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1842,7 +1839,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:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1850,15 +1847,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:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"Hvis valgt vil Gajim sortere kontakter i kontaktvinduet og i gruppesamtaler "
-"efter deres status og ikke ved det viste navn"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1868,7 +1857,7 @@ msgstr ""
 "kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
 "borte, Travlt, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1876,7 +1865,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:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1884,47 +1873,43 @@ 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:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorer rigt indhold i indkommende beskeder"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Log krypt_eret samtale session"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "Gør samtalevinduer _kompakte"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Hå_ndtere..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Påmindelser"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Påmind mig om kontakter logger _ind"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Påmind mig om kontakter som logger u_d"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Påmind mig ved ny _GMail e-post"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Personlig Hændelser"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Afspil _lyde"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1934,19 +1919,19 @@ msgstr ""
 "Påmind mig om det\n"
 "Hvis kun i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Logge _ind"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "Log _af"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1955,23 +1940,28 @@ msgstr ""
 "valgt\n"
 "vil Gajim kun vise den rå tekst."
 
-#: ../data/glade/preferences_window.glade.h:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sorter kontakter efter status"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "Status _ikonsæt:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -1979,7 +1969,7 @@ msgstr ""
 "Den automatiske jeg er væk status besked. Hvis tom vil Gajim ikke ændre den "
 "nuværende status besked"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -1987,42 +1977,52 @@ msgstr ""
 "Den automatiske jeg er ikke tilgængelig status besked. Hvis tom vil Gajim "
 "ikke ændre den nuværende status besked"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Brug _transportens ikonsæt"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Brug system stan_dard"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Når en ny hændelse er modtaget:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "_Væk efter:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Netlæser:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "Vis samtalestatus påmin_delser:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Følelsesikoner:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Filhåndterer:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "Frem_hæv stavefejl"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
 
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorer rigt indhold i indkommende beskeder"
+
 #: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "_Indkommende besked:"
@@ -2056,22 +2056,28 @@ msgid "_Send chat state notifications:"
 msgstr "_Send samtalestatus påmindelser:"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Sorter kontakter efter status"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "_Status besked:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "_URL fremhævning:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "_Vinduets adfærd:"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Bliv med i en _Gruppe Samtale"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Ikke i kontaktvindue"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutter"
 
@@ -2119,7 +2125,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Bestil:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
@@ -2263,7 +2269,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
@@ -2323,10 +2329,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5156 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
@@ -2348,59 +2352,64 @@ msgstr "Ændre _Grupper..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Kør Kommando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5075 ../src/roster_window.py:5566
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5085 ../src/roster_window.py:5651
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Kan fjernes"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Send en Enkel _Besked"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Send _Fil..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Angiv Personlig _Avatar..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Till_ad ham/hende at se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5147 ../src/roster_window.py:5603
-#: ../src/roster_window.py:5732
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Bloker"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Nægt ham/hende at se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "_Håndter Kontakt"
@@ -2414,8 +2423,8 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5597
-#: ../src/roster_window.py:5729
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
@@ -2474,7 +2483,7 @@ msgstr "_Handlinger"
 msgid "_Contents"
 msgstr "_Indhold"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -2515,11 +2524,11 @@ msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5754
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
 msgid "_Search"
 msgstr "_Søg"
 
@@ -2741,13 +2750,13 @@ msgstr "Tilskriv Open_PGP Nøgle"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Ændre _Grupper"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5712
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Omdøb"
 
@@ -2799,49 +2808,48 @@ msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktiveret"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Ikke aktiveret"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Farve"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Værdi"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ingen)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Skjult"
 
@@ -2850,148 +2858,149 @@ msgstr "Skjult"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretonsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norsk (bokmål)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Kinesisk"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Sprog for stavekontrollen"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1142 ../src/chat_control.py:1529
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1164 ../src/chat_control.py:2010
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843
-#: ../src/dialogs.py:896 ../src/gajim.py:1623 ../src/roster_window.py:926
-#: ../src/roster_window.py:1527 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1869 ../src/roster_window.py:5260
-#: ../src/roster_window.py:5437
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1293 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Ukendt Artist"
 
-#: ../src/chat_control.py:1295 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: ../src/chat_control.py:1297 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:641
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3000,7 +3009,7 @@ msgstr ""
 "<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1306
+#: ../src/chat_control.py:1314
 #, fuzzy, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -3009,49 +3018,60 @@ msgstr ""
 "<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1430
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: ../src/chat_control.py:1519
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1537 ../src/chat_control.py:1794
-msgid "Session WILL NOT be logged"
-msgstr "Session VIL IKKE blive logget"
-
-#: ../src/chat_control.py:1539 ../src/chat_control.py:1792
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Session VIL IKKE blive logget"
+
 #. encryption %s active
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1559
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1559
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1563
+#: ../src/chat_control.py:1580
 #, fuzzy
 msgid "and authenticated"
 msgstr "Brug godkendelse"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1567
+#: ../src/chat_control.py:1584
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Brug godkendelse"
@@ -3059,33 +3079,33 @@ msgstr "Brug godkendelse"
 #. 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:1573
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1619
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Kommando er ikke understøttet for zeroconf konto."
 
-#: ../src/chat_control.py:1630 ../src/groupchat_control.py:1524
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/chat_control.py:1633 ../src/groupchat_control.py:1538
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Brug: /%s, rydder tekst vinduet"
 
-#: ../src/chat_control.py:1636 ../src/groupchat_control.py:1543
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Brug: /%s, gem samtale knapper"
 
-#: ../src/chat_control.py:1639 ../src/groupchat_control.py:1559
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3094,30 +3114,41 @@ msgstr ""
 "Brug: /%(command)s <handling>, sender handling til den nuværende gruppe "
 "samtale. Brug tredie person. (f.eks. /%(command)s eksploderer.)"
 
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Brug: %s, sender en ping til kontakten"
 
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Brug: /%s, send beskeden til kontakten"
 
-#: ../src/chat_control.py:1650 ../src/groupchat_control.py:1582
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjælp for /%s"
 
-#: ../src/chat_control.py:1781
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:1788
-msgid "E2E encryption enabled"
-msgstr "E2E kryptering aktiveret"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Denne besked er krypteret]"
+
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Session VIL blive logget"
+
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Session VIL IKKE blive logget"
 
-#: ../src/chat_control.py:1799
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3125,27 +3156,27 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1830 ../src/chat_control.py:1841
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var "
 
-#: ../src/chat_control.py:1836
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "Den følgende besked var "
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2189
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2190
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3153,11 +3184,15 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../src/chat_control.py:2341 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: ../src/chat_control.py:2342 ../src/gajim.py:171
+#: ../src/chat_control.py:2377
 #, fuzzy, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3166,7 +3201,7 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(Hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2574
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
@@ -3236,40 +3271,40 @@ msgstr "Tilstedeværelses beskrivelse:"
 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:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Forlad Gruppesamtaler"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
 #, 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:195
 msgid "You have not joined a groupchat."
 msgstr "Du detlager ikke i en gruppesamtale."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
 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:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:794 ../src/roster_window.py:1531
-#: ../src/roster_window.py:1533 ../src/roster_window.py:5045
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "Du forlod de følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr "Videresend ulæste beskeder"
 
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr "Alle ulæste beskeder er blevet videresendt."
 
@@ -3318,20 +3353,20 @@ msgstr ""
 
 #. sorted alphanum
 #: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3088
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Aktiver link-local/zeroconf beskeder"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Sprog brugt af stavelseskontrollen"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3341,7 +3376,7 @@ msgstr ""
 "'nogen ganger' - skriv tid for hver print_ichat_every_foo_minutes minutter.\n"
 "'aldrig' - skriv aldrig tiden."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 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. "
@@ -3352,18 +3387,18 @@ msgstr ""
 "upræcise klokke. 1 er den mest præcise klokke, 4 den mindst præcise. Dette "
 "bruges kun hvis print_time er 'nogen ganger'."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings tegn."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
 "men * * bliver ikke fjernet."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3373,7 +3408,7 @@ msgstr ""
 "formatering hvis valgt. For syntaks, se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html (Hvis du vil bruge dette, installer docutils)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3381,7 +3416,7 @@ msgstr ""
 "Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
 "en gruppesamtale."
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3389,7 +3424,7 @@ msgstr ""
 "Tegnforslag til at tilføje efter det ønskede kælenavn, når det ønskede "
 "kælenavn er i brug af en anden i gruppesamtalen."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3400,18 +3435,14 @@ msgstr ""
 "[timer:minutter]. Se python dokumentationen for strftime: http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som bliver skrevet før kælenavnet i samtaler"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som bliver skrevet efter kælenavnet i samtaler"
 
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "Brugernavnet som skal bruges til at identificere Last.fm kontoen."
-
 #: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
@@ -3741,7 +3772,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Udglattet rulning af beskeder i samtale vinduet"
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Liste af farver som vil blive brugt til at farve kælenavne i gruppesamtaler."
 
@@ -3966,7 +4000,7 @@ msgstr "'ja', 'nej', eller 'begge'"
 msgid "'yes', 'no' or ''"
 msgstr "'ja', 'nej' eller ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Sover"
 
@@ -3978,7 +4012,7 @@ msgstr "Snart tilbage"
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Spiser"
 
@@ -3994,7 +4028,7 @@ msgstr "Film"
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Arbejder"
 
@@ -4026,7 +4060,7 @@ msgstr "Jeg er tilgængelig."
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:427 ../src/config.py:1391
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
@@ -4055,11 +4089,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "købmandsvarer"
 
@@ -4071,7 +4105,7 @@ msgstr "menneske"
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:71
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
@@ -4085,112 +4119,114 @@ msgstr "Forkert vært"
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:635
+#: ../src/common/connection_handlers.py:639
 #, 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:918
-#: ../src/common/connection_handlers.py:1815
-#: ../src/common/connection_handlers.py:1862
-#: ../src/common/connection_handlers.py:2045
-#: ../src/common/connection_handlers.py:2164 ../src/common/connection.py:1203
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Disk skrivefejl"
 
-#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:840
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:1122 ../src/common/connection.py:841
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../src/common/connection_handlers.py:1931
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
+"(Hele historikken vil tabes)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kælenavn er ikke tilladt: %s"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2002
-#: ../src/common/connection_handlers.py:2005
-#: ../src/common/connection_handlers.py:2008
-#: ../src/common/connection_handlers.py:2011
-#: ../src/common/connection_handlers.py:2015
-#: ../src/common/connection_handlers.py:2024
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: ../src/common/connection_handlers.py:2003
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2006
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: ../src/common/connection_handlers.py:2009
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: ../src/common/connection_handlers.py:2012
+#: ../src/common/connection_handlers.py:2063
 #, 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:2016
+#: ../src/common/connection_handlers.py:2067
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2025
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Dit ønskede kælenavn i gruppesamtalen %s er i brug eller registreret af en "
-"anden indehaver.\n"
-"Specificer venligst et andet kælenavn under:"
-
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2116
 #, 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:2090
+#: ../src/common/connection_handlers.py:2143
 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:2111
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nu på %s"
 
-#: ../src/common/connection_handlers.py:2113
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "forespørsel om ophør på abonnement fra %s"
 
-#: ../src/common/connection_handlers.py:2115
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nu abonnerer vi ikke længere på %s"
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4201,205 +4237,215 @@ msgstr ""
 "jabberstudio.org/ til at fjerne det."
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP adgangskode blev ikke givet"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, 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:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, 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:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:703
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1040
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:660
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Kunne ikke tilslutte til \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
+
+#: ../src/common/connection.py:666
 #, 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:663
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4408,7 +4454,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4417,24 +4463,24 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../src/common/connection.py:704
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Kontroller din tilslutning eller prøv igen senere"
 
-#: ../src/common/connection.py:729
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:793
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4443,13 +4489,13 @@ 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:1084
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 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:1086
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4457,11 +4503,11 @@ 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:1095
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1193
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4471,32 +4517,32 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1365
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Iagttagere"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117
-#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1523
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1668
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne computer"
 
-#: ../src/common/dbus_support.py:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus evner kan ikke bruges"
 
@@ -4677,250 +4723,250 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Server adresse påkrævet."
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Travlt"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "Ti_lgængelig"
 
-#: ../src/common/helpers.py:270 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "_Væk"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ../src/common/helpers.py:323
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Deltagere"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Deltager"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Ejer"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:388
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: ../src/common/helpers.py:392
+#: ../src/common/helpers.py:405
 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:395
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
-#: ../src/common/helpers.py:979 ../src/common/helpers.py:986
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, 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:992
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr "fra rum %s"
 
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr "fra bruger %s"
 
-#: ../src/common/helpers.py:997
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " fra %s"
 
-#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, 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:1044
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -4933,521 +4979,669 @@ msgstr "Gajim konto %s"
 msgid "Afraid"
 msgstr "Bange for"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Forbavset"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Vækket"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Gal"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Misfornøjet"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Ængstelig"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Vækket"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Skamfuld"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Keder mig"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Modig"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Rolig"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Nysgerrig"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Fryser"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Indhold"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Tilfreds"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Tilfreds"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Forskruet"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Forskruet"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Ikke aktiveret"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Nysgerrig"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Slet"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Deprimeret"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Væmmes"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Ikke aktiveret"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Forstyrret"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Ængstelig"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Spændt"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Flirtende"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Frustreret"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Kører"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Gnaven"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Glad"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Ydmyg"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Ydmyget"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Imponeret"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "Ærefrygt"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Indigneret"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Interesseret"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Uovervindelig"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Værtsmaskine:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Ondskabsfuld"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Gnaven"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustreret"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Spøgefuld"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Stolt"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Lettet"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Hvileløs"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Trist"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Sidst ændret:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Seriøs"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Sjokeret"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Genert"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Syg"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Stresset"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Tørstig"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Tænksom"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tid"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "ni"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Bekymret"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Laver Husarbejde"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Køber ind"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Gør Rent"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Laver Mad"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Gør Vedligeholdsarbejde"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Vasker op"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Vasker Tøj"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Laver Havearbejde"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Løber et Ærinde"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Drikker en Øl"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Drikke Kaffe"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Drikker Te"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Spiser et lille Mellemmåltid"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Spiser Morgenmad"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Træner"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Cykler"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Gør Rent"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Vandrer"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Dyrker Sport"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Løber"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Står på ski"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Træner"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Plejer"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "I Spabad"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Børster Tænder"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Bliver Klippet"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Barberer"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Tager et Bad"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Tager et Brusebad"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Har en Aftale"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Hænge ud"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Vandrer"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "Få Ferie"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Fester"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Planlagt Ferie"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Drikker"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Slapper af"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Vandrer"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Går ud"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Fester"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Læser"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Køber ind"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Står på ski"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Socialiserer"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Solbader"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Ser TV"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Ser en film."
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Taler"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Snakker i telefon."
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "Taler i Video Telefon"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Rejser"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Kører"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "På en Bus"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "Flyver"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "Kører i tog"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "På Rejse"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Går"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "I et Møde"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Skriver"
 
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Ikke i stand til at tildele port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Måske har du en anden instans af Gajim kørende. Filoverførsler vil blive "
+"annulleret."
+
 #. we're not english
-#: ../src/common/stanza_session.py:282
+#: ../src/common/stanza_session.py:278
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5541,40 +5735,40 @@ msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
 msgid "Error while adding service. %s"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: ../src/config.py:319
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:327
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Hændelse"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: ../src/config.py:410
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:452
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Altid brug OS/X standard programmer"
 
-#: ../src/config.py:453
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: ../src/config.py:643 ../src/dialogs.py:1198
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:644
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5583,105 +5777,105 @@ 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:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "status besked tekst"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Første Besked er Modtaget"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Næste Besked Modtages i Fokus"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Næste Besked Modtages uden Fokus"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt er Tilsluttet"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt er ikke Tilsluttet"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Besked er Sendt"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "GMail E-post Modtaget"
 
 #. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1822 ../src/dialogs.py:1886
-#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793
-#: ../src/history_window.py:86
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Log ind igen nu?"
 
-#: ../src/config.py:1401
+#: ../src/config.py:1406
 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:1525 ../src/config.py:1624
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
-#: ../src/config.py:1660 ../src/config.py:1703
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Ulæste hændelser"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: ../src/config.py:1687
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1694
 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:1699
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
-#: ../src/config.py:1700
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
 
-#: ../src/config.py:1704
+#: ../src/config.py:1710
 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:1710
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Kontonavnet er allerede i brug"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5689,144 +5883,144 @@ msgstr ""
 "Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
 "andet navn."
 
-#: ../src/config.py:1715 ../src/config.py:1719
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Ugyldigt kontonavn"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Kontonavnet kan ikke være tomt."
 
-#: ../src/config.py:1720
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:1794
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:1795
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864
-#: ../src/config.py:3091 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: ../src/config.py:1822
+#: ../src/config.py:1828
 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:2012 ../src/config.py:3163
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2013 ../src/config.py:3164
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2034
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2035
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Der opstod et problem under forsøget på at hente dine OpenPGP nøgler."
 
-#: ../src/config.py:2070
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2071
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2082
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2083
+#: ../src/config.py:2089
 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:2090 ../src/dialogs.py:1674 ../src/dialogs.py:1810
-#: ../src/dialogs.py:1990 ../src/disco.py:438 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2091
+#: ../src/config.py:2097
 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:2095
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2096
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2127
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2128
+#: ../src/config.py:2134
 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:2311
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2349
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2351
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2352
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2401 ../src/disco.py:762 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2409
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2418
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2443
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2445
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5834,11 +6028,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2448
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5846,11 +6040,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2450
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2451
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5858,11 +6052,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5870,7 +6064,7 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5891,16 +6085,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1412 ../src/roster_window.py:1932
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1906
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1933
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Gem adgangskode"
 
@@ -5929,41 +6123,41 @@ msgstr "Gå kun ind og ud"
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2759
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:2793
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Fyld ud server og rum tekstindtastningsfelterne eller fjern dette bogmærke."
 
-#: ../src/config.py:3074
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#: ../src/config.py:3076
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: ../src/config.py:3102
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID eksisterer"
 
-#: ../src/config.py:3103
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Denne konto er allerede konfigureret i Gajim."
 
-#: ../src/config.py:3120
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3121 ../src/config.py:3308
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5973,25 +6167,25 @@ msgstr ""
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3139
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
-#: ../src/config.py:3140
+#: ../src/config.py:3138
 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:3191 ../src/gajim.py:1984
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3192 ../src/gajim.py:1985
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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:3260
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6006,7 +6200,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3266 ../src/gajim.py:2008
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6033,7 +6227,7 @@ msgstr "Kontonavnet er i brug"
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/conversation_textview.py:547
+#: ../src/conversation_textview.py:549
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6044,7 +6238,7 @@ msgstr ""
 "ikon forbliver på skærmen længe er det sandsynlig\n"
 "at beskeden gik tabt."
 
-#: ../src/conversation_textview.py:566
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6052,51 +6246,56 @@ 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:676
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:688
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:712
 #, 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:723
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:732
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "fejl opstod under sending %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dage siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
@@ -6129,154 +6328,141 @@ msgstr "Kontakt navn: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Nøgle ID"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Gem som Forvalgt Status Besked"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresse:"
 
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyld ind data for den kontakt som du vil tilføje kontoen med navnet %s"
 
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:731
 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:871 ../src/dialogs.py:877 ../src/dialogs.py:882
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:898
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:934
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabber klient"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:994
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1035
 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:1031
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1191
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Ikke i stand til at tildele port %s."
-
-#: ../src/dialogs.py:1192
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Måske har du en anden instans af Gajim kørende. Filoverførsler vil blive "
-"annulleret."
-
-#: ../src/dialogs.py:1199
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6289,88 +6475,88 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1603
+#: ../src/dialogs.py:1614
 #, 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:1606
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:1667 ../src/gajim.py:2590
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:1675
+#: ../src/dialogs.py:1686
 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:1694
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:1765
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:1766 ../src/groupchat_control.py:1329
-#: ../src/groupchat_control.py:1601
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: ../src/dialogs.py:1770 ../src/dialogs.py:1776
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1767
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:1783
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:1822
 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:1825
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1858
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1870
 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:1883
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:1941
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6379,313 +6565,326 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, 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:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2025
 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:2054 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: ../src/dialogs.py:2056 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Ny Besked"
 
 #. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
 #. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1577 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1643 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1542 ../src/gajim.py:1610
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1682 ../src/gajim.py:1704
-#: ../src/gajim.py:1721 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1685 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1433 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: ../src/dialogs.py:2070 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, python-format
 msgid "Form %s"
 msgstr "Formular %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konsol"
 
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rækkefølge: %(order)s, handling: %(action)s, type: %(type)s, værdi: %(value)s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2931
 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:2955
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2968
 #, 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:2968
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "når jeg er"
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3836
 #, fuzzy, python-format
 msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
 "\n"
-"This session's Short Authentication String is %(sas)s."
+"This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 "Din samtale session med %(jid)s er krypteret.\n"
 "\n"
 "Denne sessions Korte Ægtheds Streng er: %(sas)s"
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+#, fuzzy
 msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+"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 ""
 "For at være sikker på at kun den person du forventer kan læse dine beskeder "
 "eller sende dig beskeder, må du verificere deres identitet."
 
-#: ../src/dialogs.py:3842
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+#, fuzzy
+msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den fjerne kontakts identitet?"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:3882
 #, fuzzy, python-format
 msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"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>."
@@ -6696,37 +6895,58 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:3883
 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/disco.py:115
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "Kontaktens nøgle (%s) passer ikke til den angivne nøgle i Gajim."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:119
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konference"
 
-#: ../src/disco.py:439
+#: ../src/disco.py:440
 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:513
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: ../src/disco.py:515
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: ../src/disco.py:655
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -6734,72 +6954,77 @@ 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:660 ../src/disco.py:942
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: ../src/disco.py:661
+#: ../src/disco.py:662
 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:741
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Ugyldigt server"
+
+#: ../src/disco.py:754
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: ../src/disco.py:781
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: ../src/disco.py:943
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:1164
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Kør Kommando"
 
-#: ../src/disco.py:1174 ../src/disco.py:1338
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1375
+#: ../src/disco.py:1390
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1557
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Brugere"
 
 #. Description column
-#: ../src/disco.py:1565
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1802
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Knude"
 
-#: ../src/disco.py:1867
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1873
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../src/disco.py:1879
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
@@ -6851,7 +7076,7 @@ msgstr "Kræver python-dbus."
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Egenskab ikke tilgængelig under Windows."
 
@@ -6990,8 +7215,18 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Omdan LaTeX udtryk mellem $$ $$."
 
 #: ../src/features_window.py:101
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Kræver texlive-latex-base, dvips og imagemagick. Du må sætte 'use_latex' til "
+"True i den avancerede konfigurations editor."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Kræver texlive-latex-base, dvips og imagemagick. Du må sætte 'use_latex' til "
@@ -7055,106 +7290,106 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremgang"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Afsender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Modtager: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gemt i: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Filoverførsel er fuldført"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Filoverførsel er afbrudt"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Tilslutning til ligeværdige kan ikke oprettes."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Modtager: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Filoverførslen blev stoppet af kontakten i den anden ende"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Vælg en Fil at Sende..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan ikke tilgå denne fil"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denne fil bliver brugt af en anden proces."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vil gerne sende dig en fil:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7162,33 +7397,33 @@ msgstr ""
 "En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Gem Fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7196,32 +7431,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
@@ -7300,68 +7535,79 @@ msgstr ""
 "En anden instans af Gajim ser ud til at køre\n"
 "Kør alligevel?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, 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)."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
 
-#: ../src/gajim.py:560
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Dit ønskede kælenavn i gruppesamtalen %s er i brug eller registreret af en "
+"anden indehaver.\n"
+"Specificer venligst et andet kælenavn under:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: ../src/gajim.py:562
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/gajim.py:919 ../src/gajim.py:923
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:933 ../src/gajim.py:946
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: ../src/gajim.py:978
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: ../src/gajim.py:998
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7369,73 +7615,73 @@ msgstr ""
 "Du vil altid se ham eller hende som offline.\n"
 "Vil du fjerne ham eller hende fra din kontakt liste?"
 
-#: ../src/gajim.py:1039
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
-#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216
-#: ../src/history_window.py:410 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nu %(status)s"
 
-#: ../src/gajim.py:1296
+#: ../src/gajim.py:1305
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1360 ../src/groupchat_control.py:1026
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
-#: ../src/gajim.py:1363
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: ../src/gajim.py:1365
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: ../src/gajim.py:1368
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En ændring i en non-privacy-related rum konfiguration har forekommet"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1371
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Rum logging er nu aktiveret"
 
-#: ../src/gajim.py:1373
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Rum logging er nu deaktiveret"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: ../src/gajim.py:1378
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: ../src/gajim.py:1381
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: ../src/gajim.py:1413
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
 
-#: ../src/gajim.py:1447
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7443,27 +7689,27 @@ msgstr ""
 "Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
 "agent som kører eller den returnerede en forkert gpg-løsen.\n"
 
-#: ../src/gajim.py:1449
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Dit pgp-løsen er ikke korrekt"
 
-#: ../src/gajim.py:1553
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1555
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d ny e-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1569
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7478,34 +7724,34 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1640
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gajim.py:1705
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1709
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1726
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1812
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7514,36 +7760,36 @@ msgstr ""
 "Ikke i stand til at dekryptere beskeden fra %s\n"
 "Det er mulig den er blevet forfalsket."
 
-#: ../src/gajim.py:1819
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: ../src/gajim.py:1889
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: ../src/gajim.py:1890
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s .s)"
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Fejl."
 
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: ../src/gajim.py:1952
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7551,11 +7797,11 @@ msgstr ""
 "Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
 "venligst en ny"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7566,15 +7812,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: ../src/gajim.py:2011
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: ../src/gajim.py:2027
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7591,11 +7837,11 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: ../src/gajim.py:2049 ../src/gajim.py:2079
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: ../src/gajim.py:2050
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7603,16 +7849,16 @@ msgstr ""
 "Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
 "sikker på du vil gøre dette?"
 
-#: ../src/gajim.py:2052 ../src/gajim.py:2082
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: ../src/gajim.py:2053 ../src/gajim.py:2083 ../src/groupchat_control.py:1707
-#: ../src/roster_window.py:3806
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "Ikke spørg mig ige_n"
 
-#: ../src/gajim.py:2080
+#: ../src/gajim.py:2089
 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?"
@@ -7621,21 +7867,21 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "PEP knude blev ikke fjernet"
 
-#: ../src/gajim.py:2098
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2548 ../src/gajim.py:2569
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/gajim.py:2549
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7643,7 +7889,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: ../src/gajim.py:2570
+#: ../src/gajim.py:2594
 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 "
@@ -7653,66 +7899,56 @@ msgstr ""
 "opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2596 ../src/roster_window.py:3334
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2877
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: ../src/gajim.py:2974
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Bogmærke er allerede sat"
 
-#: ../src/gajim.py:2975
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
 
-#: ../src/gajim.py:2988
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Bogmærket er blevet tilføjet succesfuldt"
 
-#: ../src/gajim.py:2989
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
 
-#: ../src/gajim.py:3176
-msgid "Network Manager support not available"
-msgstr "Netværks Manager understøttelse er ikke tilgængelig"
-
-#: ../src/gajim.py:3300
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Sesion håndterer understøttelse er ikke tilgængelig (mangler gnome.ui "
-"modulet)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Viser hjælp for en specifik kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "Kommando"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Viser eller gemmer kontaktvinduet"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7720,47 +7956,47 @@ msgstr ""
 "Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
 "på en separat linie"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede kontoer"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Ændrer status for kontoen eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "besked"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "status besked"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7769,20 +8005,20 @@ msgstr ""
 "status for alle kontoer der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende beskeder til en kontakt"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "Kontaktens JID som du vil samtale med"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "hvis specificeret vil kontakten tages fra kontaktlisten fra denne konto"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7792,29 +8028,29 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "besked indhold"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp nøgle"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hvis specificeret vil beskeden blive krypteret med denne nøgle"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7824,139 +8060,139 @@ msgstr ""
 "nøgle og konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP "
 "nøgle', bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "emne"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "emne på besked"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Få detaljeret information om kontakten"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Få detaljeret information om kontoen"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Filsti"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'nøgle' er navnet for indstillingen, 'værdi' er den værdi den er sat til"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "nøgle"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Tilføjer kontakt til kontaktvinduet"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Tilføjer ny kontakt til denne konto"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende status (den globale status hvis ikke en konto er "
 "valgt)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende statusbesked (den globale status besked hvis ikke en "
 "konto er valgt)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åbner 'Start Samtale' vinduet"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Starter en samtale med denne konto"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -7964,67 +8200,67 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle kontoer"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndter en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr "URI som skal håndteres"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Den konto som du vil håndtere det med"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "Rum JID"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Kælenavn som skal bruges"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Adgangskode for at slutte sig til rummet"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 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:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote.py:314
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:333
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8033,15 +8269,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:389
+#: ../src/gajim-remote.py:380
 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:418
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8050,16 +8286,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8068,7 +8304,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8077,7 +8313,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:508
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8086,7 +8322,7 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:527
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Forkert uri"
 
@@ -8115,35 +8351,35 @@ 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:145
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
 #, 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:383
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:535
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:537
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
@@ -8151,95 +8387,115 @@ msgstr ""
 "Jabber ID."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1132
 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:1040
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1142
 #, 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:1051
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1153
 #, 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:1064
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1102
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1107
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s er blevet udvist af %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s er blevet udvist: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1214
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kælenavn ikke fundet: %s"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Denne gruppe samtale har ikke noget emne"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Inviterede %(contact_jid)s til %(room_jid)s."
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8252,7 +8508,7 @@ msgstr ""
 "\"@\". Hvis en bruger med JID'en er tilstede i gruppe samtalen vil han/hun/"
 "den/det også blive udvist. Mellemrum i kælenavnet er ikke understøttet."
 
-#: ../src/groupchat_control.py:1534
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8261,7 +8517,7 @@ msgstr ""
 "Brug: /%s <kælenavn>, åbner et privat samtale vindue med den specificerede "
 "bruger."
 
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8270,7 +8526,7 @@ msgstr ""
 "Brug: /%s [begrundelse], lukker det nuværende vindue eller fan, visende "
 "begrundelsen hvis specificeret."
 
-#: ../src/groupchat_control.py:1546
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8279,7 +8535,7 @@ msgstr ""
 "Brug: /%s <JID> [begrundelse], inviter JID til den nuværende gruppe samtale, "
 "visende begrundelsen hvis specificeret"
 
-#: ../src/groupchat_control.py:1550
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8288,7 +8544,7 @@ msgstr ""
 "Brug: /%s <rum>@<server>[/kælenavn], tilbyder at deltage i rum@server "
 "eventuelt med det specificerede kælenavn."
 
-#: ../src/groupchat_control.py:1554
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8298,7 +8554,7 @@ msgstr ""
 "Brug: /%s <kælenavn> [begrundelse], fjerner deltager med kælenavnet fra "
 "gruppe samtalen og hvis specificeret, viser en begrundelse"
 
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8307,64 +8563,64 @@ msgstr ""
 "Brug: /%s <kælenavn> [besked], åbner et privat samtale vindue og sender "
 "beskeden til deltageren med det specificerede kælenavn."
 
-#: ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
 
-#: ../src/groupchat_control.py:1572
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Brug: /%s , viser navnene på deltagerne i gruppe samtalen."
 
-#: ../src/groupchat_control.py:1576
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Brug: /%s [emne], viser eller opdaterer det nuværende gruppe samtale emne."
 
-#: ../src/groupchat_control.py:1579
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Brug: /%s <besked>, sender en besked uden at kigge efter andre kommandoer."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1837
 #, 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:1703
+#: ../src/groupchat_control.py:1839
 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:1740
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1882
 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:1773
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8372,22 +8628,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1950
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2247
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -8470,7 +8726,7 @@ msgstr "Kontakter"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
@@ -8481,7 +8737,7 @@ msgstr "Kælenavn"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Besked"
 
@@ -8531,22 +8787,27 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette de valgte beskeder?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversations Historik med %s"
 
-#: ../src/history_window.py:406
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Disk SkriveFejl"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:416
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:419
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
@@ -8559,19 +8820,19 @@ msgstr "Tidsudløb nået for at laste billede"
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: ../src/message_window.py:440
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:442
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -8583,42 +8844,42 @@ msgstr "- beskeder vil blive logget"
 msgid "- messages will not be logged"
 msgstr "- beskeder vil ikke blive logget"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Besked fra gruppe samtale %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Besked fra %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
@@ -8631,18 +8892,18 @@ msgstr "Fællesbetegnelse"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2803
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2806
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2808 ../src/roster_window.py:2819
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
@@ -8674,40 +8935,40 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:955
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1882
 #, 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:1883
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8715,15 +8976,15 @@ msgstr ""
 "Gnomes Nøglering er installeret men ikke \t\t\t\t\t\t\t startet korrekt "
 "(miljøvariabel er sandsynligvis ikke \t\t\t\t\t\t\t sat op rigtig)"
 
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:2095 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2096 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8731,15 +8992,15 @@ 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:2122
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2493
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8747,16 +9008,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:2494
+#: ../src/roster_window.py:2522
 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:2497
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2498
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8764,11 +9025,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:2501
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8778,51 +9039,52 @@ msgstr ""
 "kontakter som bruger disse transporter: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2734
 #, 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:2744
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+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:2790
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3146
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8830,7 +9092,13 @@ msgstr ""
 "Ved at fjerne denne kontakt fjerner du også godkendelsen, så han eller hun "
 "vil altid se dig som offline."
 
-#: ../src/roster_window.py:3151
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Vil du acceptere denne invitation?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8838,16 +9106,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:3154
+#: ../src/roster_window.py:3144
 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:3158
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8857,20 +9125,20 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3192
 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:3720
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -8879,12 +9147,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:3800
+#: ../src/roster_window.py:3784
 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:3802
+#: ../src/roster_window.py:3786
 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 "
@@ -8893,11 +9161,11 @@ 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:3915
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:3926
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -8909,123 +9177,123 @@ msgstr[1] "Vil du sende disse filer til %s:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4598 ../src/roster_window.py:4669
-#: ../src/roster_window.py:4678 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4690
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:4727
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4747
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:4787
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4849 ../src/roster_window.py:4958
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:4876
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:4883
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Humør"
 
-#: ../src/roster_window.py:4887
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: ../src/roster_window.py:4892
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5046
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
 #. Send Group Message
-#: ../src/roster_window.py:5054 ../src/roster_window.py:5558
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5062
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
-#: ../src/roster_window.py:5460
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5578
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
 #. Send single message
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5703
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
-#: ../src/roster_window.py:5778
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5785
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
-#: ../src/roster_window.py:5865
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
 #. History manager
-#: ../src/roster_window.py:5978
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: ../src/roster_window.py:5987
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:6197
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
@@ -9042,27 +9310,27 @@ msgstr "Fejl i modtaget dataform"
 msgid "No result"
 msgstr "Intet resultat"
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Disk SkriveFejl"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../src/session.py:392 ../src/session.py:430
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
-#: ../src/session.py:393
-#, python-format
+#: ../src/session.py:400
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t\t%s\n"
+"\t%s\n"
 "\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
 msgstr ""
 "Den fjerne klient vil forhandle en session med disse egenskaber:\n"
 "\n"
@@ -9070,7 +9338,7 @@ msgstr ""
 "\n"
 "\t\tKan disse indstillinger godkendes?"
 
-#: ../src/session.py:431
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9085,19 +9353,19 @@ msgstr ""
 "\n"
 "Fortsæt med sessionen?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Ændre Status Besked..."
 
-#: ../src/systray.py:261
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ressource: "
 
@@ -9114,95 +9382,95 @@ msgstr " [blokeret]"
 msgid " [minimized]"
 msgstr " [minimeret]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Sidste status: %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abonnering: "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Humør:"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Melodi:"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Hent"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Send"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Fuldført"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Midlertidig stoppet"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Hænger"
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
 
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9210,24 +9478,24 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Ukendt"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9235,7 +9503,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9243,14 +9511,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 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:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9258,18 +9526,59 @@ msgstr ""
 "Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
 "interesseret i din"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 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:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Slå til/fra Open_PGP Kryptering"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Brug: /%(command)s <handling>, sender handling til den nuværende gruppe "
+#~ "samtale. Brug tredie person. (f.eks. /%(command)s eksploderer.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E kryptering aktiveret"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E kryptering ikke aktiveret"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Hvis valgt vil Gajim sortere kontakter i kontaktvinduet og i "
+#~ "gruppesamtaler efter deres status og ikke ved det viste navn"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "Brugernavnet som skal bruges til at identificere Last.fm kontoen."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Tænksom"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Netværks Manager understøttelse er ikke tilgængelig"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Sesion håndterer understøttelse er ikke tilgængelig (mangler gnome.ui "
+#~ "modulet)"
+
 #~ msgid "Close"
 #~ msgstr "Luk"
 
diff --git a/po/de.po b/po/de.po
index 3cbff1b31..9fbd68fdb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 18:50+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-28 22:49+0200\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -295,9 +295,9 @@ msgstr "Persönliche Informationen bearbeiten ..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1040
-#: ../src/common/helpers.py:1052 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -309,8 +309,8 @@ msgstr "Gajim"
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2664
-#: ../src/roster_window.py:5147
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Allgemein"
 
@@ -375,20 +375,20 @@ msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1558
-#: ../src/config.py:2058
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1148
-#: ../src/config.py:1219 ../src/config.py:1466 ../src/config.py:1471
-#: ../src/config.py:1966 ../src/config.py:2044 ../src/config.py:2057
-#: ../src/config.py:3160 ../src/config.py:3228 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2733
-#: ../src/roster_window.py:2739 ../src/roster_window.py:2744
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Kein"
 
@@ -557,7 +557,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -572,7 +572,7 @@ msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5098
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "_Umbenennen"
 
@@ -791,7 +791,7 @@ msgid "All statuses"
 msgstr "Alle Status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:287
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Abwesend"
 
@@ -808,7 +808,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -817,7 +817,7 @@ msgid "Launch a command"
 msgstr "Einen Befehl ausführen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -1050,7 +1050,7 @@ msgstr "Zur Kont_aktliste hinzufügen"
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5794
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -1161,7 +1161,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zeige eine Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -1169,7 +1169,7 @@ msgstr "_Fortsetzen"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Benachrichtige mich, wenn der Dateitransfer abgeschlossen ist"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Öffne Ordner"
 
@@ -1217,7 +1217,7 @@ msgstr "Gajim Thema Einstellungen"
 msgid "Gone"
 msgstr "Weg"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inaktiv"
 
@@ -1325,7 +1325,7 @@ msgstr "_Stimme verleihen"
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:312
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Von"
 
@@ -1381,7 +1381,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Suche Datenbank"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
@@ -1404,7 +1404,7 @@ msgstr "Suche:"
 msgid "_Log conversation history"
 msgstr "Unterhaltungs-Ver_lauf"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1689
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Betrete Gruppenchat"
 
@@ -1533,7 +1533,8 @@ msgid "Browse the chat history (Ctrl+H)"
 msgstr "Chatverlauf durchsuchen (STRG-H)"
 
 #: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Raumtitel ändern (STRG-H)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1563,7 +1564,7 @@ msgstr "Benutzerprofil anzeigen (STRG+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Senden"
 
@@ -2138,7 +2139,7 @@ msgstr "Jabber-ID:"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2558
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Privatliste"
 
@@ -2282,7 +2283,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Namensvorsatz:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
@@ -2342,8 +2343,8 @@ msgstr "Konto _entfernen (in Gajim und auf dem Server)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5135
-#: ../src/roster_window.py:5612 ../src/roster_window.py:5741
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -2365,14 +2366,14 @@ msgstr "_Gruppen bearbeiten ..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5684
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "_Befehl ausführen ..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5053 ../src/roster_window.py:5565
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
@@ -2382,7 +2383,7 @@ msgstr "_Entfernen"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5063 ../src/roster_window.py:5650
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Benutzerdefinierten Status senden"
 
@@ -2408,8 +2409,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Erlaube Kontakt, meinen Status zu sehen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5126 ../src/roster_window.py:5602
-#: ../src/roster_window.py:5731
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Blockieren"
 
@@ -2435,8 +2436,8 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5120 ../src/roster_window.py:5596
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "Entblocken"
 
@@ -2535,7 +2536,7 @@ msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5753
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "Informationen"
 
@@ -2758,13 +2759,13 @@ msgstr "Open_PGP-Schlüssel zuweisen"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5585
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5711
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Umbenennen"
 
@@ -2815,49 +2816,48 @@ msgid "Service returned an error."
 msgstr "Dienst gab einen Fehler zurück."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Kein)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Versteckt"
 
@@ -2866,149 +2866,149 @@ msgstr "Versteckt"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Englisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norwegisch (Bokmål)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1147 ../src/chat_control.py:1535
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2030
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:299 ../src/conversation_textview.py:844
-#: ../src/dialogs.py:895 ../src/gajim.py:1626 ../src/roster_window.py:932
-#: ../src/roster_window.py:1532 ../src/roster_window.py:1534
-#: ../src/roster_window.py:1876 ../src/roster_window.py:3102
-#: ../src/roster_window.py:3126 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5431
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1298 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: ../src/chat_control.py:1300 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: ../src/chat_control.py:1302 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: ../src/chat_control.py:1306 ../src/tooltips.py:641
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3017,7 +3017,7 @@ msgstr ""
 "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
 "von <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1311
+#: ../src/chat_control.py:1314
 #, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -3026,81 +3026,92 @@ msgstr ""
 "%(title)s von %(artist)s\n"
 "von %(source)s"
 
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus Gruppenchat %(room_name)s"
 
-#: ../src/chat_control.py:1525
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "Sitzung wird aufgezeichnet"
 
-#: ../src/chat_control.py:1552
+#: ../src/chat_control.py:1560
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung wird nicht aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:1570
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1570
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1580
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1584
 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:1586
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1632
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Befehl wird für zeroconf Benutzer nicht unterstützt."
 
-#: ../src/chat_control.py:1643 ../src/groupchat_control.py:1622
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Befehle: %s"
 
-#: ../src/chat_control.py:1646 ../src/groupchat_control.py:1636
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bedienung: /%s, leert das Textfenster."
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1641
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Verwendung: /%s, versteckt die Chatbuttons."
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1657
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3109,38 +3120,38 @@ msgstr ""
 "Bedienung: /%(command)s <action>, sendet Aktion im aktuellen Gruppenchat. "
 "Verwenden Sie eine dritte Person, z.B. mit /%(command)s explodiert)."
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Bedienung: /%s, sendet einen Ping zum Kontakt"
 
-#: ../src/chat_control.py:1660
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt"
 
-#: ../src/chat_control.py:1663 ../src/groupchat_control.py:1680
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s"
 
-#: ../src/chat_control.py:1794
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Sitzungs-Aushandlung abgebrochen"
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1807
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:1804
+#: ../src/chat_control.py:1810
 msgid " and WILL be logged"
 msgstr " und WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:1806
+#: ../src/chat_control.py:1812
 msgid " and WILL NOT be logged"
 msgstr " und WIRD NICHT aufgezeichnet"
 
-#: ../src/chat_control.py:1811
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3148,25 +3159,25 @@ msgstr ""
 "Identität des Gesprächspartners nicht überprüft. Mehr Informationen durch "
 "Klicken auf Schild-Schaltfläche"
 
-#: ../src/chat_control.py:1813
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1842 ../src/chat_control.py:1855
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
 msgid "The following message was NOT encrypted"
 msgstr "[Die folgende Nachricht wurde nicht verschlüsselt]"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1854
 msgid "The following message was encrypted"
 msgstr "Die folgende Nachricht war verschlüsselt"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/chat_control.py:2218
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3174,11 +3185,15 @@ msgstr ""
 "Wenn sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/chat_control.py:2369 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2370 ../src/gajim.py:171
+#: ../src/chat_control.py:2377
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3187,7 +3202,7 @@ msgstr ""
 "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie diese zu "
 "reparieren oder zu löschen (dabei werden alle Verläufe verloren gehen)."
 
-#: ../src/chat_control.py:2602
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
@@ -3276,9 +3291,9 @@ msgstr "Wählen Sie den Gruppenchat, den Sie verlassen möchten"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:800 ../src/roster_window.py:1536
-#: ../src/roster_window.py:1538 ../src/roster_window.py:5023
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
@@ -3335,9 +3350,9 @@ msgstr ""
 "sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:449
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3092
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "Standard"
 
@@ -3427,15 +3442,11 @@ msgstr "Zeichen, die vor dem Spitzname gedruckt werden"
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
-#: ../src/common/config.py:165
-msgid "The username used to identify the Last.fm account."
-msgstr "Benutzername zur Identifikation des Last.FM Kontos."
-
-#: ../src/common/config.py:169
+#: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Füge * und [n] in die Kontaktleiste?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:169
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3443,12 +3454,12 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn "
 "ein Chat Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:170
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:171
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3456,11 +3467,11 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Mirabilis ICQ-Client Standardeinstellung)."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:173
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:176
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3469,13 +3480,13 @@ msgstr ""
 "Entweder eine spezielle URL mit %s, wobei %s das Word/Phrase ist oder "
 "'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:179
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Wenn aktiviert, kann Gajim von Außerhalb mittels gajim-remote kontrolliert "
 "werden."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:180
 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 "
@@ -3487,14 +3498,14 @@ msgstr ""
 "auf False gesetzt und sie synchronisieren sich mit dem globalen Status) "
 "basierend auf dem Status der Netzwerkverbindung."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:181
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Chat-Statusbenachrichtigungen gesendet. Kann eine von allen sein, "
 "composing_only deaktiviert."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:182
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3502,7 +3513,7 @@ msgstr ""
 "Angezeigte Chat-Status Benachrichtigungen im Chatfenster. Kann all, "
 "composing_only oder disabled sein."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:184
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3510,11 +3521,11 @@ msgstr ""
 "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
 "(print_time==sometimes), zeige sie alle x Minuten."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:185
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:186
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3522,7 +3533,7 @@ msgstr ""
 "Immer fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
 "seperierten Liste von Gruppchatnamen geschlossen wird."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:187
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3530,7 +3541,7 @@ msgstr ""
 "Niemals fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
 "seperierten Liste von Gruppenchatnamen geschlossen wird."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:190
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3538,27 +3549,27 @@ msgstr ""
 "Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-"
 "Forwarding"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:192
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-Standard sagt KiB = 1024 Byte, kB = 1000 Byte."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:194
 msgid "Notify of events in the system trayicon."
 msgstr "Benachrichtige über Ereignisse durch das Trayicon"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:200
 msgid "Show tab when only one conversation?"
 msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:201
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chat-Fenster anzeigen?"
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:202
 msgid "Show close button in tab?"
 msgstr "Schließen-Button im Tab anzeigen?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:203
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -3566,7 +3577,7 @@ msgstr ""
 "Soll Gajim beim Aushandeln einer verschlüsselten Sitzung annehmen, dass Sie "
 "Ihre Nachricht mitschneiden wollen?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:204
 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 "
@@ -3578,18 +3589,18 @@ msgstr ""
 "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
+#: ../src/common/config.py:213
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten im Benachrichtigungs-Popup?"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:218
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Eine mit Semilkolon seperierte Liste von Worten, die in einem Gruppenchat "
 "hervorgehoben werden."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:219
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3598,14 +3609,14 @@ msgstr ""
 "geklickt wird. Diese Option wird nur beachtet, wenn die Trayicon-"
 "Unterstützung aktiv ist."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:220
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Wenn aktiviert, wird Gajim beim Starten überprüfen, ob Gajim der Standard-"
 "Jabber-Client ist."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3613,7 +3624,7 @@ msgstr ""
 "Wenn aktiviert, wird Gajim ein Icon auf jedem Tab mit ungelesenen "
 "Nachrichten anzeigen. Abhängig vom Thema kann dieses Icon animiert sein."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3621,13 +3632,13 @@ msgstr ""
 "Wenn aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, falls "
 "nicht leer, unter dem jeweiligen Kontaktnamen im Roster anzeigen."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:227
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definiere die Position des Avatars in der Kontaktliste. Links oder rechts "
 "sind mögliche Optionen."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:228
 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."
@@ -3635,7 +3646,7 @@ msgstr ""
 "Wenn aktiviert fragt Gajim nach einem Avatar für jeden Kontakt, der beim "
 "letzten Mal keinen hatte oder einen veralteten hat."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:229
 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."
@@ -3643,7 +3654,7 @@ msgstr ""
 "Wenn deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
 "Kontakt seinen Status und/oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:230
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3657,30 +3668,30 @@ msgstr ""
 "Statusnachrichten anzeigen. Falls \"in_and_out\", wird Gajim nur einen "
 "Status anzeigen, wenn jemand den Gruppenchat betritt oder verlässt."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:232
 msgid "Background color of contacts when they just signed in."
 msgstr "Hintergrundfarbe von Kontakten wenn sie sich gerade noch anmeldeten."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten wenn sie sich gerade noch abmeldeten."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:235
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Wenn aktiv, werden wiederhergestellte Nachrichten mit einer kleineren "
 "Schrift als der Standard dargestellt."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:236
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selber."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:237
 msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der System-Taskleiste anzeigen."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:238
 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 "
@@ -3690,7 +3701,7 @@ msgstr ""
 "sind, lasse das Fenster bei neuen Ereignissen aufblitzen (Standardverhalten "
 "in den meisten Window-Managers) "
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:240
 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 "
@@ -3701,7 +3712,7 @@ msgstr ""
 "Informationen in Gruppenchats zu senden"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3723,32 +3734,32 @@ msgstr ""
 "speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu gestartet "
 "werden, damit die Änderungen übernommen werden"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:244
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Wenn deaktiviert, werden Sie den Avatar nicht mehr im Chatfenster sehen."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:245
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Wenn aktiviert, schließt die Escape-Taste ein Tab/Fenster."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:246
 msgid "Hides the buttons in chat windows."
 msgstr "Versteckt die Knöpfe im Gruppenchat-Fenster."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:247
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:248
 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:249
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Gruppenchat-Benutzerliste im Gruppenchat-Fenster."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:250
 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,28 +3767,31 @@ msgstr ""
 "Zeige in einem Chat den Spitznamen nur dann am Beginn einer Linie, wenn es "
 "nicht die selbe Person ist die schon die letzte Nachricht geschrieben hat."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Einrückung, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:252
 msgid "Smooth scroll message in conversation window"
 msgstr "Sanftes Scrollen der Nachricht im Unterhaltungsfenster"
 
-#: ../src/common/config.py:254
-msgid "List of colors that will be used to color nicknames in group chats."
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Farbliste, die für die Einfärbung von Spitzenamen im Gruppenchat verwendet "
 "wird."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:254
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Strg-Tab, um zum nächsten Reiter zu gehen, wenn kein Anderer neue "
 "Nachrichten enthält."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:255
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3785,7 +3799,7 @@ msgstr ""
 "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
 "werden oder nicht? Bei leerer Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:256
 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 "
@@ -3796,7 +3810,7 @@ msgstr ""
 "mit einer negativen Priorität angemeldet sind: Sie werden KEINE Nachrichten "
 "mehr von Ihrem Server erhalten."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:257
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3804,7 +3818,7 @@ msgstr ""
 "Wenn aktiviert, wird Gnome Keyring (insofern verfügbar) verwendet, um die "
 "Passwörter der Konten zu speichern."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:258
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3812,7 +3826,7 @@ msgstr ""
 "Wenn aktiviert, wird Gajim die Anzahl der angemeldeten und gesamten Kontakte "
 "in den Konto- und Gruppenreihen anzeigen."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:259
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3820,7 +3834,7 @@ msgstr ""
 "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, dann werden alle "
 "eingehenden Nachrichten so behandelt, als wären sie von diesem Typ."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3829,7 +3843,7 @@ msgstr ""
 "die die letzte Nachricht geschickt hat, falls das Chat Fenster nicht bereits "
 "offen ist."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3837,13 +3851,13 @@ msgstr ""
 "Wenn 'true', wird Gajim eine Zeichenkette zwischen $$ und $$ mittels dvips "
 "vor dem Einfügen in ein Chat-Fenster in ein Bild umwandeln."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:262
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Benötigte Inaktivitäts-Zeit bevor das 'Status ändern'-Fenster geschlossen "
 "wird."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:263
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3851,7 +3865,7 @@ msgstr ""
 "Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
 "Zeilen werden gelöscht."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:264
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3859,11 +3873,11 @@ msgstr ""
 "Wenn wahr, werden Benachrichtigungsfenster vom Benachrichtigungsdienst an "
 "das Systray-Icon angehängt."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:265
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Wählen Sie einen Zeitabstand zwischen zwei Leerlaufüberprüfungen."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:266
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3871,13 +3885,13 @@ msgstr ""
 "Wert ändern um LaTeX-Anzeigengröße zu ändern. Hoher Wert resultiert in "
 "großer Anzeige."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:267
 msgid ""
 "Valid uri schemes. Only schemes in this list will be made accepted as \"real"
 "\" uri."
 msgstr ""
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:278
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3885,7 +3899,7 @@ msgstr ""
 "Die Priorität wird automatisch dem Status entsprechend geändert. Prioritäten "
 "sind in den autopriority_* Optionen definiert."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:286
 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"
@@ -3893,26 +3907,26 @@ msgstr ""
 "Status bei automatischer Verbindung. Wahleise: Angemeldet, Frei zum Chatten, "
 "Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar."
 
-#: ../src/common/config.py:288
+#: ../src/common/config.py:287
 msgid "If enabled, restore the last status that was used."
 msgstr "Wenn aktiviert, wird die letzte Statusmeldung wiederhergestellt."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:292
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Wenn deaktiviert, wird die Anwesenheit nicht mit einem GPG-Schlüssel "
 "signiert, wenn GPG konfiguriert ist."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:294
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiviere ESessions-Verschlüsselung für dieses Konto."
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:295
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Wenn möglich, soll Gajim ESession-Verschlüsselung automatisch starten?"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:296
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -3920,24 +3934,24 @@ msgstr ""
 "Geordnete Liste (mit Leerzeichen getrennt) zu versuchender Verbindungstypen. "
 "Kann tls, ssl oder plain enthalten"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:297
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Zeige eine Warnmeldung bevor das Passwort über eine unsichere Verbindung "
 "übertragen wird."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:298
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Zeige eine Warnmeldung bevor das Passwort über eine mit Standard-SSL-"
 "Bibliothek geschützten Verbindung übertragen wird."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:300
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Leerzeichen getrennte Liste von SSL-Fehler, die zu ignorieren sind."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:312
 msgid ""
 "How many seconds to wait for the answer of keepalive packet before we try to "
 "reconnect."
@@ -3946,11 +3960,11 @@ msgstr ""
 "wieder herzustellen."
 
 #. yes, no, ask
-#: ../src/common/config.py:317
+#: ../src/common/config.py:316
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 Workaround"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:320
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3958,19 +3972,19 @@ msgstr ""
 "Wenn aktiviert, wird Gajim Ihre IP und die in der file_transfer_proxies "
 "Option definierten Proxies für den Datentransfer verwenden."
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:334
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:335
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungsanfragen senden"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:389
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:391
+#: ../src/common/config.py:390
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3978,101 +3992,101 @@ msgstr ""
 "Wenn möglich, soll Gajim eine ESession-Verschlüsselung mit diesem Kontakt "
 "automatisch starten?"
 
-#: ../src/common/config.py:392 ../src/common/config.py:395
+#: ../src/common/config.py:391 ../src/common/config.py:394
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache für, die nach falsch geschriebenen Wörtern gesucht werden soll"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:400
 msgid "all or space separated status"
 msgstr "alle oder Leerzeichen-getrennter Status"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:401
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:403 ../src/common/config.py:405
-#: ../src/common/config.py:406 ../src/common/config.py:409
-#: ../src/common/config.py:410
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:416 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:418 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade."
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:418
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:418
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:420 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:419
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:420
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:420
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:421
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:421
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:425
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:426
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:428 ../src/config.py:1398
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:429
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:431 ../src/common/config.py:432
+#: ../src/common/config.py:430 ../src/common/config.py:431
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:441
 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."
@@ -4080,24 +4094,24 @@ msgstr ""
 "Abzuspielender Ton, falls eine Gruppenchat-Nachricht eines der Wörter aus "
 "der muc_highlights_works-Liste oder Ihren Spitznamen enthält."
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:442
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 "Ton der beim empfangen einer Gruppenchat-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:452 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:456 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "marine"
 msgstr "Marine"
 
@@ -4121,25 +4135,38 @@ msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
 
-#: ../src/common/connection_handlers.py:926
-#: ../src/common/connection_handlers.py:1839
-#: ../src/common/connection_handlers.py:1879
-#: ../src/common/connection_handlers.py:2061
-#: ../src/common/connection_handlers.py:2180 ../src/common/connection.py:1220
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt."
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:851
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Unsichtbarkeit wird von Konto %s nicht unterstützt."
 
-#: ../src/common/connection_handlers.py:1948
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie diese zu "
+"reparieren oder zu löschen (dabei werden alle Verläufe verloren gehen)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
@@ -4147,70 +4174,70 @@ msgstr "Spitzname nicht erlaubt: %s"
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2023
-#: ../src/common/connection_handlers.py:2026
-#: ../src/common/connection_handlers.py:2029
-#: ../src/common/connection_handlers.py:2032
-#: ../src/common/connection_handlers.py:2036 ../src/gajim.py:546
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Gruppenchats"
 
-#: ../src/common/connection_handlers.py:2024
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sie sind von Gruppenchat %s gebannt."
 
-#: ../src/common/connection_handlers.py:2027
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Der Gruppenchat %s existiert nicht."
 
-#: ../src/common/connection_handlers.py:2030
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Gruppenchaterstellung ist beschränkt."
 
-#: ../src/common/connection_handlers.py:2033
+#: ../src/common/connection_handlers.py:2063
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Sie müssen Ihren registrierten Spitznamen im Gruppenchat %s verwenden."
 
-#: ../src/common/connection_handlers.py:2037
+#: ../src/common/connection_handlers.py:2067
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Sie sind nicht in der Mitgliedliste des Gruppenchats %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2072
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Raum wurde zerstört"
 
-#: ../src/common/connection_handlers.py:2079
+#: ../src/common/connection_handlers.py:2116
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesem Raum beitreten: %s"
 
-#: ../src/common/connection_handlers.py:2106
+#: ../src/common/connection_handlers.py:2143
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2127
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "wir haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:2129
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Kündigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:2299
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4221,219 +4248,219 @@ msgstr ""
 "um ihn zu entfernen"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2324
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2326
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1927 ../src/roster_window.py:1947
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP mit %s verbunden."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Kann Zertifikat des Ausstellers nicht holen"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Kann Zertifikats CRL nicht holen"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kann Zertifikatsunterschrift nicht entschlüsseln"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kann CRLs Unterschrift nicht entschlüsseln"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Kann öffentlichen Schlüssel nicht entschlüsseln"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Zertifikat-Unterschrift-Fehler"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "CRL-Unterschrift-Fehler"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Zertifikat ist noch nicht gültig"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Zertifikat ist abgelaufen"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL ist nocht nicht gültig"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL ist abgelaufen"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im notBefore Feld des Zertifikats"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im notAfter Feld des Zertifikats"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im lastUpdate Feld des CRLs"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler in nextUpdate Feld des CRLs"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "Selbstsigniertes Zertifikat in der Zertifikatkette"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "Kann lokales Herausgeberzertifikat nicht holen"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "Kann erstes Zertifikat nicht prüfen"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Zertifikatkette zu lang"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Zertifikat widerrufen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA Zertifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstütztes Zertifikatsverwendungszweck"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Server %(name)s beantwortete Registrierungsanfrage nicht korrekt: %(error)s"
 
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s bot ein anderes Registrierungsformular"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s beantwortete Registrierungsanfrage nicht korrekt: %(error)"
 "s"
 
-#: ../src/common/connection.py:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:713
-#: ../src/common/connection.py:1349
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1042
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 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:645 ../src/common/connection.py:693
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:646 ../src/common/connection.py:694
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Verbindung mit Konto \"%s\" wurde unterbrochen. Verbindung wird "
 "wiederhergestellt."
 
-#: ../src/common/connection.py:668
+#: ../src/common/connection.py:666
 #, 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:671
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4442,7 +4469,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:673
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4451,24 +4478,24 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:712
 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:739
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:741
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie ihren Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:802
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatliste"
 
-#: ../src/common/connection.py:803
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4478,14 +4505,14 @@ msgstr ""
 "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
 "es erneut."
 
-#: ../src/common/connection.py:1095
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 "Weder die entfernte Präsenz ist signiert, noch wurde ein Schlüssel "
 "zugewiesen."
 
-#: ../src/common/connection.py:1097
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4495,11 +4522,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1106
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:1210
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4509,32 +4536,32 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1382
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:792 ../src/roster_window.py:834
-#: ../src/roster_window.py:1461 ../src/roster_window.py:1528
-#: ../src/roster_window.py:1530 ../src/roster_window.py:1673
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 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:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
 
@@ -4715,250 +4742,250 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:161
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Server-Adresse wird benötigt."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen in Hostname."
 
-#: ../src/common/helpers.py:172
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in Resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:280 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Angemeldet"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:322
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:398
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:405
 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:405
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
-#: ../src/common/helpers.py:989 ../src/common/helpers.py:996
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d Nachricht schwebend"
 msgstr[1] "%d Nachrichten schwebend"
 
-#: ../src/common/helpers.py:1002
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr "Von Gruppenchat %s"
 
-#: ../src/common/helpers.py:1005 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr "Von Benutzer %s"
 
-#: ../src/common/helpers.py:1007
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1014 ../src/common/helpers.py:1021
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d Ereignis anstehend"
 msgstr[1] "%d Ereignisse anstehend"
 
-#: ../src/common/helpers.py:1054
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indices"
 
@@ -4971,515 +4998,649 @@ msgstr "Gajim-Konto %s"
 msgid "Afraid"
 msgstr "Verängstigt"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Verblüfft"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Erregt"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Wütend"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Ärgerlich"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Ängstlich"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Erregt"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Tapfer"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Gelassen"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Neugierig"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Kalt"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "In_halte"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Verwirrt"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Zufrieden"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Zufrieden"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Reizbar"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Reizbar"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deaktiviert"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Neugierig"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Löschen"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Deprimiert"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Enttäuscht"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Angewidert"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Deaktiviert"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Abgelenkt"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:56
 msgid "Embarrassed"
 msgstr "Verlegen"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Ängstlich"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Kokett"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Frustriert"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Fahren"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Mürrisch"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Schuldbewusst"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Fröhlich"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Heiß"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Demütig"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Gedemütigt"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Verletzt"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Beeindruckt"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "Bewundernd"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Verliebt"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Entrüstet"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Interessiert"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Berauscht"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Unbesiegbar"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Neidisch"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Einsam"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Server:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Fies"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Launisch"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nervös"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Beleidigt"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustriert"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Scherzhaft"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Stolz"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Erleichtert"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Erleichtert"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Reuevoll"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Ruhelos"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Traurig"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Sarkastisch"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Zuletzt geändert:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Ernst"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Geschockt"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Schüchtern"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Krank"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Müde"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Gestresst"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Überrascht"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Durstig"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Nachdenklich"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Zeit"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Unterstreichen"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Besorgt"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Haushalt machen"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Lebensmittel einkaufen"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Putzen"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Kochen"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Instandhaltung"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Geschirr spülen"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Wäsche waschen"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Gartenarbeit"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Besorgungen machen"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Hund ausführen"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Etwas trinken"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Bier trinken"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Kaffee trinken"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Tee trinken"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Zwischenmahlzeit"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Frühstücken"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Abendessen"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Mittagessen"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Rad fahren"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Putzen"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Wandern"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Joggen"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Beim Sport"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Laufen"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Ski fahren"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Schwimmen"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Ausarbeiten"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Waschen"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "Im Bad"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Zähne putzen"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Beim Frisör"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Rasieren"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Baden"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Unter der Dusche"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Termin"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Freier Tag"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Rumhängen"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Wandern"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Feiern"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Geplanter Urlaub"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Etwas trinken"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Entspannen"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Wandern"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Spielen"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Ausgehen"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Feiern"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Lesen"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Studieren"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Shoppen"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Ski fahren"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Unter Leuten"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Sonnenbaden"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Fernsehen"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Film schauen"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Im Gespräch"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "Im echten Leben"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "Am Videotelefon"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Reisen"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Pendeln"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Fahren"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "Im Auto"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "Im Bus"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "Im Flugzeug"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "Im Zug"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "Auf einer Reise"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Spazierengehen"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Programmieren"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "In einer Besprechung"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Lernen"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Schreiben"
 
@@ -5619,12 +5780,12 @@ msgstr "OS/X Standardprogramme immer verwenden"
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../src/config.py:651 ../src/dialogs.py:1191
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Wörterburch für Sprache %s nicht verfügbar"
 
-#: ../src/config.py:652
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5633,105 +5794,105 @@ msgstr ""
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung zu nutzen."
 
-#: ../src/config.py:1017
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1017
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht fixiert"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht fixiert"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:1059
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:1060
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:1061
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Gruppenchat Nachrichten-Hervorhebung"
 
-#: ../src/config.py:1062
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: ../src/config.py:1063
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "E-Mail über Googlemail empfangen"
 
 #. Name column
-#: ../src/config.py:1320 ../src/dialogs.py:1815 ../src/dialogs.py:1879
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
 #: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
-#: ../src/history_window.py:86
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Jetzt neu einloggen?"
 
-#: ../src/config.py:1407
+#: ../src/config.py:1406
 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 neu "
 "einloggen."
 
-#: ../src/config.py:1532 ../src/config.py:1631
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1667 ../src/config.py:1710
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1668
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
 
-#: ../src/config.py:1694
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit Account %s einen Chat geöffnet"
 
-#: ../src/config.py:1695
+#: ../src/config.py:1694
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1711
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
 msgstr "Um Kontonamen zu ändern, müssen Sie alle neunen Ereignisse lesen."
 
-#: ../src/config.py:1717
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Kontoname wird bereits verwendet"
 
-#: ../src/config.py:1718
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5739,149 +5900,149 @@ msgstr ""
 "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte "
 "wählenSie einen anderen Namen."
 
-#: ../src/config.py:1722 ../src/config.py:1726
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1723
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1727
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1801
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:1802
+#: ../src/config.py:1801
 #, 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:1820 ../src/config.py:1828 ../src/config.py:1871
-#: ../src/config.py:3098 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1829
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:2019 ../src/config.py:3170
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2020 ../src/config.py:3171
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:2041
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:2042
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP-Schlüssels."
 
-#: ../src/config.py:2077
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Schlüssel-Auswahl"
 
-#: ../src/config.py:2078
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2089
 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:2097 ../src/dialogs.py:1667 ../src/dialogs.py:1803
-#: ../src/dialogs.py:1983 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:2098
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt vCard nicht"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden"
 
-#: ../src/config.py:2135
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
 "aktivieren."
 
-#: ../src/config.py:2318
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:2320
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2356
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2359
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2408 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2421
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2425
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2450
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Verbannen ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2452
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5889,11 +6050,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2454
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen ..."
 
-#: ../src/config.py:2455
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5901,11 +6062,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2457
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen ..."
 
-#: ../src/config.py:2458
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5913,11 +6074,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2460
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Füge Administrator hinzu ..."
 
-#: ../src/config.py:2461
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5925,7 +6086,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2462
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5940,84 +6101,84 @@ msgstr ""
 "3 domain (die Domain selbst trifft zu, als auch jeder benutzer@domain,\n"
 "jede domain/resource oder Adresse, die eine Subdomain enthält."
 
-#: ../src/config.py:2565
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2587 ../src/gajim.py:1414 ../src/roster_window.py:1939
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2588 ../src/roster_window.py:1913
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2589 ../src/roster_window.py:1940
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2598
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2599
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2695
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2695
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2696
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2697
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2766
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Dieses Lesezeichen hat ungültige Daten"
 
-#: ../src/config.py:2800
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Lesezeichen löschen."
 
-#: ../src/config.py:3081
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3083
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
 
-#: ../src/config.py:3109
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Doppelte Jabber ID"
 
-#: ../src/config.py:3110
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Dieser Kontakt wurde in Gajim bereits konfiguriert."
 
-#: ../src/config.py:3127
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3128 ../src/config.py:3317
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6027,26 +6188,26 @@ msgstr ""
 "oder durch Klicken des Konto-Menüpunktes im Bearbeiten-Menü des "
 "Hauptfensters erreichen."
 
-#: ../src/config.py:3146
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Bitte geben Sie an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:3198 ../src/gajim.py:1990
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Zertifikat schon in der Datei"
 
-#: ../src/config.py:3199 ../src/gajim.py:1991
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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 Datei %"
 "s befindet."
 
-#: ../src/config.py:3267
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6061,7 +6222,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie dennoch zum Server verbinden?"
 
-#: ../src/config.py:3273 ../src/gajim.py:2014
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6072,30 +6233,30 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3296 ../src/config.py:3335
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3316
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3419
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:3420
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/conversation_textview.py:548
+#: ../src/conversation_textview.py:549
 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:567
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6103,51 +6264,56 @@ msgstr ""
 "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in "
 "diesem Gruppenchat gesagt wurde"
 
-#: ../src/conversation_textview.py:677
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:694
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:711
+#: ../src/conversation_textview.py:712
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "In Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In Websuche URL fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:727
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
 
-#: ../src/conversation_textview.py:733
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: ../src/conversation_textview.py:1218
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1222
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1256
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -6180,141 +6346,141 @@ msgstr "Kontaktname: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i> "
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status-Nachricht"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Status-Nachricht überschreiben"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dieser Name wird bereits verwendet. Möchten Sie die Status-Nachricht "
 "überschreiben?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Als derzeitige Statusnachricht speichern"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Nummer"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-Adresse"
 
-#: ../src/dialogs.py:711
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:713
+#: ../src/dialogs.py:731
 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:870 ../src/dialogs.py:876 ../src/dialogs.py:881
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer ID"
 
-#: ../src/dialogs.py:877
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine resource enthalten."
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "Es ist nicht möglich sich selber zu seiner Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:896
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt bereits im Roster"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
 
-#: ../src/dialogs.py:933
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1003
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1005
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035
 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:1030
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -6323,7 +6489,7 @@ msgstr ""
 "Sebastian Schäfer <sarek@uliweb.de>\n"
 "Nico Gulden"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6336,90 +6502,90 @@ msgstr ""
 "\n"
 "Das Hervorheben falsch geschriebener Worte wird nicht genutzt"
 
-#: ../src/dialogs.py:1596
+#: ../src/dialogs.py:1614
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnement-Anfrage für Konto %(account)s von %(jid)s"
 
-#: ../src/dialogs.py:1599
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:1660 ../src/gajim.py:2594
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Gruppenchat %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Betrete Gruppenchat mit Account %s"
 
-#: ../src/dialogs.py:1758
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1427
-#: ../src/groupchat_control.py:1703
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen."
 
-#: ../src/dialogs.py:1763 ../src/dialogs.py:1769
-#: ../src/groupchat_control.py:1871
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Gruppenchat"
 
-#: ../src/dialogs.py:1764 ../src/dialogs.py:1770
-#: ../src/groupchat_control.py:1872
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen."
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Das ist kein Gruppenchat"
 
-#: ../src/dialogs.py:1777
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist kein Name eines Gruppenchats."
 
-#: ../src/dialogs.py:1804
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte zu Synchronisieren."
 
-#: ../src/dialogs.py:1818
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:1852
+#: ../src/dialogs.py:1870
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Sie können nicht mit einem Konto Synchronisieren, solange es nicht verbunden "
 "ist."
 
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Account %s"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:1937
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6428,274 +6594,276 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1962 ../src/dialogs.py:2337 ../src/dialogs.py:2480
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:1963 ../src/dialogs.py:2338 ../src/dialogs.py:2481
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:1972 ../src/dialogs.py:1975
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Ungültige JID"
 
-#: ../src/dialogs.py:1975
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:1984
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:2003
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2003
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2007
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2008
+#: ../src/dialogs.py:2025
 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:2047 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2049 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:2051 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2051 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2052 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:2052 ../src/gajim.py:1580 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2054 ../src/gajim.py:1646 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
-#: ../src/dialogs.py:2056 ../src/gajim.py:1545 ../src/gajim.py:1613
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:2058 ../src/gajim.py:1688 ../src/gajim.py:1710
-#: ../src/gajim.py:1727 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1691 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1435 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2063 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht mit Account %s"
 
-#: ../src/dialogs.py:2258
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht in Account %s"
 
-#: ../src/dialogs.py:2260
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2286
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2381
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2382
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:2426
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:2428
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:2552
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatliste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2556
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: ../src/dialogs.py:2617
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:2659
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:2746
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:2842
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatliste für %s"
 
-#: ../src/dialogs.py:2844
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Privatlisten"
 
-#: ../src/dialogs.py:2914
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:2915
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 "Sie müssen einen Namen eingeben um eine Privatsphären-Liste zu erstellen."
 
-#: ../src/dialogs.py:2948
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in Gruppenchat eingeladen"
 
-#: ../src/dialogs.py:2951
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:2953
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:2961
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3018
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3028 ../src/dialogs.py:3079
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/dialogs.py:3066
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:3084
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3149
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:3151
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:3222
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:3346
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:3821
+#: ../src/dialogs.py:3836
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6707,41 +6875,41 @@ msgstr ""
 "Der Kurz-Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)"
 "s</b>"
 
-#: ../src/dialogs.py:3825
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben bereits die Identität dieses Kontaktes überprüft."
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3839
+#: ../src/dialogs.py:3854
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3844
+#: ../src/dialogs.py:3859
 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> die erwartete Person Nachrichten von "
-"Ihnen lesen kann oder Ihnen Nachrichten senden kann, müssen Sie die Identität "
-"überprüfen, indem Sie den Knopf unten drücken."
+"Ihnen lesen kann oder Ihnen Nachrichten senden kann, müssen Sie die "
+"Identität überprüfen, indem Sie den Knopf unten drücken."
 
-#: ../src/dialogs.py:3847
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:3869
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3866
+#: ../src/dialogs.py:3881
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:3867
+#: ../src/dialogs.py:3882
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6756,12 +6924,35 @@ msgstr ""
 "\n"
 "Der Kurz-Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:3883
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 "Haben Sie mit dem Kontakt gesprochen um den Kurz-Authentifizierungs-"
 "Schluessel zu überprüfen?"
 
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+"Der Kontaktschlüssel (%s) stimmt nicht mit dem in Gajim zugewiesenen "
+"Schlüssel überein."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
 #: ../src/disco.py:116
 msgid "Others"
 msgstr "Andere"
@@ -6917,7 +7108,7 @@ msgstr "Erfordert python-dbus."
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Funktion unter Windows nicht verfügbar."
 
@@ -7066,6 +7257,15 @@ msgstr ""
 "Erfordert texlive-latex-base, dvips und imagemagick. Sie müssen 'use_latex' "
 "im Advanced Configuration Editor auf 'true' setzen."
 
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Erfordert texlive-latex-base, dvips und imagemagick. Sie müssen 'use_latex' "
+"im Advanced Configuration Editor auf 'true' setzen."
+
 #: ../src/features_window.py:103
 msgid "End to End Encryption"
 msgstr "Esession-Verschlüsselung"
@@ -7122,106 +7322,106 @@ msgstr "Zeit"
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Sie"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Dateitransfer abgeschlossen"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Dateitransfer abgebrochen"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Gegenseite hat Dateitransfer gestoppt"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Datei auswählen ..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim kann auf diese Datei nicht zugreifen"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7229,35 +7429,35 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die Rechte "
 "sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
 "anzulegen."
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Datei speichern unter ..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7265,32 +7465,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
@@ -7369,11 +7569,11 @@ msgstr ""
 "Eine andere Instanz von Gajim schein bereits zu laufen\n"
 "Trotzdem starten?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -7381,17 +7581,17 @@ msgstr ""
 "(account)s)."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
 "Abbrechen."
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7402,50 +7602,50 @@ msgstr ""
 "wurde von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Akzeptieren Sie diese Anfrage vom %s Konto?"
 
-#: ../src/gajim.py:566
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:614 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gajim.py:920 ../src/gajim.py:924
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:934 ../src/gajim.py:947
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:979
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:980
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen."
 
-#: ../src/gajim.py:999
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:1000
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7453,74 +7653,74 @@ msgstr ""
 "Sie werden sie oder ihn immer als offline sehen.\n"
 "Möchten Sie sie oder ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:1220 ../src/groupchat_control.py:1138
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
-#: ../src/gajim.py:1235 ../src/groupchat_control.py:1313
-#: ../src/history_window.py:410 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1305
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1362 ../src/groupchat_control.py:1098
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Jeder Teilnehmer darf Ihre volle JID sehen"
 
-#: ../src/gajim.py:1365
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Raum zeigt jetzt abwesende Teilnehmer"
 
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "Raum zeigt jetzt abwesende Teilnehmer nicht an"
 
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Eine nicht Privatsphären-bezogene Raum-Konfigurations-Änderung ist "
 "aufgetreten"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1373
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Raum-Mitschnitt ist jetzt aktiviert"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Raum-Mitschnitt ist jetzt deaktiviert"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Raum ist jetzt un-anonym"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Raum ist jetzt semi-anonym"
 
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Raum ist jetzt voll anonym"
 
-#: ../src/gajim.py:1415
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Für das Betreten des Gruppenchats-Raumes %s wird ein Passwort benötig."
 
-#: ../src/gajim.py:1449
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7528,27 +7728,27 @@ msgstr ""
 "Du hast Gajim für die Verwendung des GPG-Agenten konfiguriert, aber es läuft "
 "kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1454
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:1556
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail auf %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1563
 #, 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-Nachricht"
 msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
 
-#: ../src/gajim.py:1572
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7563,34 +7763,34 @@ msgstr ""
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1643
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte ihnen eine Datei senden."
 
-#: ../src/gajim.py:1711
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
 
 #. ft stopped
-#: ../src/gajim.py:1715
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1728
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben %(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/gajim.py:1732
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7599,36 +7799,36 @@ msgstr ""
 "Nicht möglich die Nachricht von %s zu entschlüsseln\n"
 "Eventuell wurde diese verändert."
 
-#: ../src/gajim.py:1825
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Unmöglich Nachricht zu entschlüsseln"
 
-#: ../src/gajim.py:1895
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gajim.py:1896
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: ../src/gajim.py:1908
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1921
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1932
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/gajim.py:1957
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Resourcenkonflikt"
 
-#: ../src/gajim.py:1958
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7636,11 +7836,11 @@ msgstr ""
 "Sie sind mit diesem Konto bereits mit derselben Ressource verbunden.Bitte "
 "geben Sie eine neue ein"
 
-#: ../src/gajim.py:2011
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gajim.py:2012
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7651,15 +7851,15 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie dennoch zum Server verbinden?"
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7677,11 +7877,11 @@ msgstr ""
 "Möchten Sie dennoch verbinden und den Fingerprint des Zertifikats "
 "aktualisieren?"
 
-#: ../src/gajim.py:2055 ../src/gajim.py:2085
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/gajim.py:2056
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7689,16 +7889,16 @@ msgstr ""
 "Sie sind dabei Ihr Passwort über eine nicht verschlüsselte Verbindung zu "
 "senden. Sind Sie sicher, dass Sie dies tun möchten?"
 
-#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/gajim.py:2059 ../src/gajim.py:2089 ../src/groupchat_control.py:1812
-#: ../src/roster_window.py:3785
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/gajim.py:2086
+#: ../src/gajim.py:2089
 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?"
@@ -7707,21 +7907,21 @@ msgstr ""
 "ratsam PyOpenSSL zu installieren um dies zu beheben. Sind Sie sicher, dass "
 "Sie dies tun möchten?"
 
-#: ../src/gajim.py:2103
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "PEP Knoten wurde nicht entfernt"
 
-#: ../src/gajim.py:2104
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP Knoten %(node)s wurde nicht entfernt: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2552 ../src/gajim.py:2573
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gajim.py:2553
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7729,7 +7929,7 @@ msgstr ""
 "Das konfigurierte Emoticon-Thema wurde nicht gefunden. Emoticans sind "
 "deaktiviert."
 
-#: ../src/gajim.py:2574
+#: ../src/gajim.py:2594
 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 "
@@ -7739,112 +7939,104 @@ msgstr ""
 "eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
 "http://trac.gajim.org/wiki/Emoticons für mehr Informationen."
 
-#: ../src/gajim.py:2600 ../src/roster_window.py:3315
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2881
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:2978
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Lesezeichen existiert schon"
 
-#: ../src/gajim.py:2979
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Gruppenchat \"%s\" ist schon in den Lesezeichen."
 
-#: ../src/gajim.py:2992
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Lesezeichen wurde erfolgreich hinzugefügt"
 
-#: ../src/gajim.py:2993
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Sie können ihre Lesezeichen über das Aktionen-Menü in der Kontaktliste "
 "bearbeiten"
 
-#: ../src/gajim.py:3182
-msgid "Network Manager support not available"
-msgstr "Unterstützung für Network Manager nicht verfügbar"
-
-#: ../src/gajim.py:3306
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "zeige die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "Gibt eine Liste aller Kontakte im Roster aus. Eine Zeile je Kontakt"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Ändere den Status eines oder mehrerer Konten"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "Eins von: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "Nachricht"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7853,21 +8045,21 @@ msgstr ""
 "aller Konten für die \"Kontostatus mit globalem Status abgleichen\" "
 "aktiviert ist"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Zeige Chatfenster, so dass eine Nachricht an einen Kontakt gesendet werden "
 "kann"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID des Kontakts mit Sie chatten möchten"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7877,29 +8069,29 @@ msgstr ""
 "Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
 "Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID des Kontakts, der die Nachricht empfängt"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 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:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 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:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7909,138 +8101,138 @@ msgstr ""
 "und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
 "Schlüssel, lassen Sie 'OpenGPG-Schlüssel' einfach leer."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Sendet eine neue Nachricht an einen Gruppenchat, den Sie betreten haben."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID des Raums, der die Nachricht empfängt"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über Kontakt"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID des Kontakts"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Zeige alle Einstellung und ihre Werte"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setze Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' ist der Name der Option, 'value' ist der der einzustellende Wert"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Lösche eine Einstellung"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibe die aktuellen Gajim-Einstellung in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus dem Roster"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Fügt Kontakt zum Roster hinzu"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Fügt neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Gibt derzeitigen Status zurück (der globale Status, außer, es wird ein "
 "Account spezifiziert)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Gibt derzeitige Statusnachricht zurück (der globale, außer, es wird ein "
 "Account angegeben)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öffnet den 'Chat starten' Dialog"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Starte Chat mit diesem Account"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8048,67 +8240,67 @@ msgstr ""
 "Konto, an welchen XML gesendet wird; wenn nicht spezifiziert, wird XML an "
 "alle Konten gesendet"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Behandle eine xmpp:/ URI"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Konto mit welchem Sie dies bedienen möchten"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Neuen Raum betreten"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "Raum"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "Raum ID"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Spitzname, welcher benutzt werden soll"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Passwörter um den Raum zu betreten"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Konto mit welchem Sie den Raum betreten möchten"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:326
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8117,17 +8309,17 @@ msgstr ""
 "'%s' ist nicht in ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:329
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:382
+#: ../src/gajim-remote.py:380
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Gajim scheint nicht gestartet zu sein. gajim-remote kann somit nicht genutzt "
 "werden."
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8136,16 +8328,16 @@ msgstr ""
 "Bedienung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:419
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:423
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8154,7 +8346,7 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:496
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8163,7 +8355,7 @@ msgstr ""
 "Zu viele Argumente. \n"
 "Geben Sie \"%(basename)s help %(command)s\" für weitere Informationen ein"
 
-#: ../src/gajim-remote.py:501
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8172,7 +8364,7 @@ msgstr ""
 "Argument \"%(arg)s\" wurde nicht definiert. \n"
 "Geben Sie \"%(basename)s help  %(command)s\" für weitere Informationen ein"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
@@ -8202,150 +8394,150 @@ msgstr "Sie können ihr derzeitiges Theme nicht löschen"
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
 
-#: ../src/groupchat_control.py:145
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Sie sind nicht mehr im Gruppenchat \"%(room)s\" oder \"%(nick)s\" hat den "
 "Gruppenchat verlassen."
 
-#: ../src/groupchat_control.py:430
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:582
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:584
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: ../src/groupchat_control.py:1001
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/groupchat_control.py:1002
+#: ../src/groupchat_control.py:1028
 #, 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 er/sie Ihre echte Jabber ID kennen."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1101
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Raum-Mitschnitt ist aktiviert"
 
-#: ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Ein neuer Raum wurde erstellt"
 
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1132
 msgid "The server has assigned or modified your roomnick"
 msgstr "Der Server hat Ihren Raum-Nick zugewiesen oder verändert"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeworfen: %(reason)s"
 
-#: ../src/groupchat_control.py:1116
+#: ../src/groupchat_control.py:1142
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s rausgeworfen: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:1136
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1174 ../src/groupchat_control.py:1178
-#: ../src/groupchat_control.py:1183
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s wurde aus dem Raum geworfen: %(reason)s"
 
-#: ../src/groupchat_control.py:1175
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert: "
 
-#: ../src/groupchat_control.py:1180
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "Gruppenchatkonfiguration wurde auf ausschließlich Mitgleider geändert"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "System wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1280
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1284
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1273
+#: ../src/groupchat_control.py:1299
 #, 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:1277
+#: ../src/groupchat_control.py:1303
 #, 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:1306
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Gruppenchat betreten"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1426 ../src/groupchat_control.py:1702
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1468
-#: ../src/groupchat_control.py:1552 ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1484
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Dieser Gruppenchat hat kein Thema"
 
-#: ../src/groupchat_control.py:1495
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
-#: ../src/groupchat_control.py:1625
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8358,7 +8550,7 @@ msgstr ""
 "ein \"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es "
 "ebenfalls gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_control.py:1632
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8367,7 +8559,7 @@ msgstr ""
 "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem "
 "Inhaber des angegebenen Spitznamens."
 
-#: ../src/groupchat_control.py:1638
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8376,7 +8568,7 @@ msgstr ""
 "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
 "eines Grundes, falls angegeben."
 
-#: ../src/groupchat_control.py:1644
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8385,7 +8577,7 @@ msgstr ""
 "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Gruppenchat ein, "
 "optional mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1648
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8394,7 +8586,7 @@ msgstr ""
 "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1652
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8405,7 +8597,7 @@ msgstr ""
 "Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen "
 "im Spitznamen."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8415,25 +8607,25 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamens."
 
-#: ../src/groupchat_control.py:1666
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat."
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Benutzung: /%s , zeigt die Namen der Gruppenchatbesucher."
 
-#: ../src/groupchat_control.py:1674
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-"
 "Thema."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8441,41 +8633,41 @@ msgstr ""
 "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
 "beachten."
 
-#: ../src/groupchat_control.py:1806
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Gruppenchat \"%s\" wirklich verlassen?"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1839
 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 Gruppenchat "
 "geschlossen."
 
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1846
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Bitte bestimmen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1850
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:1882
 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:1878
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Zerstöre %s"
 
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8483,22 +8675,22 @@ msgstr ""
 "Sie werden den Raum endgültig zerstören.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Raum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2055
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_control.py:2056 ../src/groupchat_control.py:2359
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2358
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8586,7 +8778,7 @@ msgstr "Kontakte"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
@@ -8597,7 +8789,7 @@ msgstr "Spitzname"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Nachricht"
 
@@ -8648,22 +8840,27 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungs-Verlauf mit %s"
 
-#: ../src/history_window.py:406
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Fehler beim Schreiben auf Festplatte"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:416
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:419
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
@@ -8700,42 +8897,42 @@ msgstr "- Nachrichten werden aufgezeichnet"
 msgid "- messages will not be logged"
 msgstr "- Nachrichten werden nicht aufgezeichnet"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte Status"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Neue einzelne Nachricht von %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht von Gruppenchat %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
@@ -8748,18 +8945,18 @@ msgstr "Allgemein"
 msgid "Retrieving profile..."
 msgstr "Empfange Profil ..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2778
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2781
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2783 ../src/roster_window.py:2794
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
@@ -8792,38 +8989,38 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten, versuchen Sie es später nochmals."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:961
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1856
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1857
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1877
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1878
+#: ../src/roster_window.py:1882
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Wenn \"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status."
 
-#: ../src/roster_window.py:1890
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:1916
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8832,15 +9029,15 @@ msgstr ""
 "(Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t\tkorrekt gesetzt "
 "gesetzt)"
 
-#: ../src/roster_window.py:1926 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
-#: ../src/roster_window.py:2114 ../src/roster_window.py:3258
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2115 ../src/roster_window.py:3259
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8848,15 +9045,15 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen "
 "Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:2141
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2275 ../src/roster_window.py:2512
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2276
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8864,16 +9061,16 @@ msgstr ""
 "Nachrichten werden nur für das spätere Lesen verfügbar sein, wenn der "
 "Verlauf aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie alle lesen, bevor der Account entfernt wird."
 
-#: ../src/roster_window.py:2516
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2517
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8881,11 +9078,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
 "austauschen."
 
-#: ../src/roster_window.py:2520
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8895,51 +9092,51 @@ msgstr ""
 "austauschen: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2659
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2660
+#: ../src/roster_window.py:2669
 #, 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:2667
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2677
 #, 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:2724
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2725
+#: ../src/roster_window.py:2734
 #, 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:2726
+#: ../src/roster_window.py:2735
 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:2765
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:2766
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3119
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3123
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8949,11 +9146,11 @@ msgstr ""
 "wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3137
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8962,17 +9159,17 @@ msgstr ""
 "die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: ../src/roster_window.py:3135
+#: ../src/roster_window.py:3144
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3139
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3143
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8982,22 +9179,22 @@ msgstr ""
 "entziehen Sie ihnen auch die Berechtigung Ihren Status zu sehen, wodurch die "
 "Kontakte Sie nur noch als offline sehen werden."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3183
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
 "können."
 
-#: ../src/roster_window.py:3699
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:3701
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9006,14 +9203,14 @@ msgstr ""
 "Informationen. Aus diesem Grund werden diese Informationen bei der nächsten "
 "Neuverbindung nicht gespeichert werden."
 
-#: ../src/roster_window.py:3779
+#: ../src/roster_window.py:3784
 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:3781
+#: ../src/roster_window.py:3786
 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 "
@@ -9023,11 +9220,11 @@ msgstr ""
 "gruppieren. Normalerweise benutzt man Sie, wenn eine Person mehrere Jabber- "
 "oder Transport-Konten hat."
 
-#: ../src/roster_window.py:3894
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Ungültige Datei URI:"
 
-#: ../src/roster_window.py:3905
+#: ../src/roster_window.py:3910
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9039,123 +9236,123 @@ msgstr[1] "Wollen Sie die Dateien an %s senden:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4576 ../src/roster_window.py:4647
-#: ../src/roster_window.py:4656 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "mit Konto %s"
 
 #. add
-#: ../src/roster_window.py:4663
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "an Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4668
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "mit Konto %s"
 
-#: ../src/roster_window.py:4705 ../src/systray.py:257
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Lesezeichen _verwalten ..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4725
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "von Konto %s"
 
-#: ../src/roster_window.py:4765
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
-#: ../src/roster_window.py:4827 ../src/roster_window.py:4936
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:4854
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:4861
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Stimmung"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Aktivität"
 
-#: ../src/roster_window.py:4870
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren ..."
 
-#: ../src/roster_window.py:5024
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
 #. Send Group Message
-#: ../src/roster_window.py:5032 ../src/roster_window.py:5557
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "_Sende Nachricht an Gruppe"
 
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "An alle Benutzern"
 
-#: ../src/roster_window.py:5044
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Send single message
-#: ../src/roster_window.py:5638
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5694
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "Transports"
 
 #. Modify Transport
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "Trans_port ändern"
 
-#: ../src/roster_window.py:5777
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
-#: ../src/roster_window.py:5864
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 #. History manager
-#: ../src/roster_window.py:5977
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:5986
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Gruppenchat betreten"
 
-#: ../src/roster_window.py:6196
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht ..."
 
@@ -9172,20 +9369,20 @@ msgstr "Fehler den empfangenen Daten"
 msgid "No result"
 msgstr "Kein Ergebnis"
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:391 ../src/session.py:423
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungs-Optionen"
 
-#: ../src/session.py:392
+#: ../src/session.py:400
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9200,7 +9397,7 @@ msgstr ""
 "\n"
 "\t\tSind diese Einstellungen akzeptabel?"
 
-#: ../src/session.py:424
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9215,19 +9412,19 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht ..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Versteckt dieses Menü"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber-ID:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ressource: "
 
@@ -9244,95 +9441,95 @@ msgstr " [blockiert]"
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status: %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Stimmung:"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Aktivität:"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Musiktitel:"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9340,25 +9537,25 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Anwendungen</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9366,7 +9563,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
 "sind nicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9374,14 +9571,14 @@ msgstr ""
 "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
 "sie ist nicht an ihren interessiert"
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Sie und der Kontakt sind an den Anwesenheitsinformationen des Anderen "
 "interessiert"
 
 #. None
-#: ../src/vcard.py:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9389,18 +9586,57 @@ msgstr ""
 "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie ist "
 "nicht interessiert an ihrer"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Sie warten auf die Antwort des Kontaktes auf ihre Abonnement-Anfrage"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Open_PGP-Verschlüsselung aktivieren"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Kein Befehl: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Bedienung: /%(command)s <action>, sendet Aktion im aktuellen Gruppenchat. "
+#~ "Verwenden Sie eine dritte Person, z.B. mit /%(command)s explodiert)."
+
+#~ msgid "Encryption enabled"
+#~ msgstr "Verschlüsselung aktiviert"
+
+#~ msgid "Encryption disabled"
+#~ msgstr "Verschlüsselung deaktiviert"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "Benutzername zur Identifikation des Last.FM Kontos."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Nachdenklich"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Unterstützung für Network Manager nicht verfügbar"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)"
+
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
@@ -9665,10 +9901,6 @@ msgstr " Resource mit Priorität "
 #~ msgid "in"
 #~ msgstr "in"
 
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "Kein Befehl: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
-
 #~ msgid "Musiktitel:"
 #~ msgstr "Art:"
 
@@ -9685,16 +9917,6 @@ msgstr " Resource mit Priorität "
 #~ "Wenn aktiviert, kann Gajim regelmäßig ein Last.FM Konto abfragen und "
 #~ "kürzlich gespielte Songs über PEP senden."
 
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr ""
-#~ "%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
-
-#~ msgid "Encryption enabled"
-#~ msgstr "Verschlüsselung aktiviert"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Verschlüsselung deaktiviert"
-
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Verbindung zu Host konnte nicht hergestellt werden"
 
@@ -10224,9 +10446,6 @@ msgstr " Resource mit Priorität "
 #~ msgid "Send File"
 #~ msgstr "Datei Senden"
 
-#~ msgid "Underline"
-#~ msgstr "Unterstreichen"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Neuen Raum betreten..."
 
diff --git a/po/el.po b/po/el.po
index 4b7393713..8d71b3b9c 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: 2007-01-19 15:22+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-19 16:09+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: \n"
@@ -37,45 +37,53 @@ msgid "Jabber IM Client"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Αποστολή μονού _μηνύματος"
+#: ../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
-msgid "_Discover Services..."
-msgstr "Εύρεση _υπηρεσιών..."
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Discover Services"
+msgstr "Εύρεση _υπηρεσιών"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Εκτέλεση εντολής..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Ομαδική συζήτηση"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Επεξεργασία λογαριασμού"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Επεξεργασία λογαριασμού..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 #, 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -88,53 +96,81 @@ msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Παρακαλώ επιλέξτε ένα από τα παρακάτω:</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
-msgid "<b>Please fill in the data for your new account</b>"
-msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
+#, fuzzy
+msgid "<b>Please fill in the data for your existing account</b>"
+msgstr "Παρακαλώ συμπληρώστε τα δεδομένα για τον υπάρχων λογαριασμό σας"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των διακομιστών του jabber"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των "
+"διακομιστών του jabber"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+msgid "I already have an account I want to _use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "_Κωδικός πρόσβασης:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Διαχείριση..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Μεσολαβητής:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "_Αποθήκευση κωδικού"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -142,67 +178,64 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
 "να συνδεθείτε στο Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Το JID σας:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "Για προ_χωρημένους"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "Ε_ξυπηρετητής:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Εξυπηρετητής:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Κωδικός πρόσβασης:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "Επανά_ληψη κωδικού:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Εξυπηρετητής:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Χρήση μεσολαβητή"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "Όν_ομα χρήστη:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Διάφορα</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Προσωπικές πληροφορίες</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Λογαριασμός"
 
@@ -211,231 +244,378 @@ msgid "Account Modification"
 msgstr "Τροποποίηση λογαριασμού"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Λίστα διαχειριστών"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Αλλα_γή κωδικού πρόσβασης"
 
-#: ../data/glade/account_modification_window.glade.h:9
-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"
-
 #: ../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 ""
+"Επιλέξτε το ώστε το Gajim να συνδεθεί στην θύρα 5223 όπου οι παλαιότεροι "
+"διακομιστές αναμένουν SSL σύνδεση. Σημειώστε ότι το Gajim χρησιμοποιεί "
+"κρυπτογράφηση TLS αυτόματα αν αυτή η δυνατότητα του γνωστοποιηθεί από τον "
+"διακομιστή, και ότι με αυτή την επιλογή απενεργοποιείται το TLS"
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Επιλογή _κλειδιού..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:457
-#: ../src/notify.py:479
-#: ../src/notify.py:491
-#: ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346
-#: ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436
-#: ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154
-#: ../src/common/contacts.py:280
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Γενικά"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Εξυπηρετητής:"
 
-#: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Αν επιλεγεί, το Gajim θα δημοσιοποιήσει μερικές ακόμα IP εκτός από τη δική σας, ώστε να υπάρχουν περισσότερες πιθανότητες να δουλέψει η μεταφορά αρχείων."
-
 #: ../data/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 ""
+"Αν επιλεγεί, το Gajim θα δημοσιοποιήσει μερικές ακόμα IP εκτός από τη δική "
+"σας, ώστε να υπάρχουν περισσότερες πιθανότητες να δουλέψει η μεταφορά "
+"αρχείων."
+
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
 #, fuzzy
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Αν επιλεγεί, το Gajim θα στέλνει πακέτα keep-alive ώστε να αποφύγει την διακοπή της σύνδεσης"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα στέλνει πακέτα keep-alive ώστε να αποφύγει την "
+"διακοπή της σύνδεσης"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Εάν επιλεγεί, το Gajim θα αποθηκεύσει τον κωδικό πρόσβασης στο ~/.gajim/config με δικαίωμα ανάγνωσης μόνο για εσάς"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Εάν επιλεγεί, το Gajim θα αποθηκεύσει τον κωδικό πρόσβασης στο ~/.gajim/"
+"config με δικαίωμα ανάγνωσης μόνο για εσάς"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Εάν επιλεγεί, το Gajim, όταν εκτελεστεί, θα συνδεθεί αυτόματα στο jabber χρησιμοποιώντας αυτόν το λογαριασμό"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Εάν επιλεγεί, το Gajim, όταν εκτελεστεί, θα συνδεθεί αυτόματα στο jabber "
+"χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Εάν επιλεγεί, οι αλλαγές που γίνονται στη γενική κατάσταση (από τον επιλογέα στο κάτω μέρος της λίστας επαφών) θα αλλάζουν ανάλογα την κατάσταση αυτού του λογαριασμού"
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Εάν επιλεγεί, οι αλλαγές που γίνονται στη γενική κατάσταση (από τον επιλογέα "
+"στο κάτω μέρος της λίστας επαφών) θα αλλάζουν ανάλογα την κατάσταση αυτού "
+"του λογαριασμού"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
-#: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Διαχείριση..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1617
-#: ../src/config.py:3414
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1197
-#: ../src/config.py:1202
-#: ../src/config.py:1386
-#: ../src/config.py:1607
-#: ../src/config.py:1616
-#: ../src/config.py:1675
-#: ../src/config.py:1749
-#: ../src/config.py:3404
-#: ../src/config.py:3413
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Κανένα"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Θύρα: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Π_ροτεραιότητα:"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Η προτεραιότητα χρησιμοποιείται στο Jabber για να καθορίσει ποιος λαμβάνει τα γεγονότα από τον jabber διακομιστή όταν δύο ή περισσότερες εφαρμογές είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Η προτεραιότητα χρησιμοποιείται στο Jabber για να καθορίσει ποιος λαμβάνει "
+"τα γεγονότα από τον jabber διακομιστή όταν δύο ή περισσότερες εφαρμογές "
+"είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την "
+"μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Μεσολαβητής:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "_Πόρος: "
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Ο πόρος στέλνεται στον εξυπηρετητή Jabber ώστε να διαχωριστεί το ίδιο JID σε δύο ή περισσότερα μέρη ανάλογα με τον αριθμό των εφαρμογών που είναι συνδεδεμένες στον ίδιο εξυπηρετητή με τον ίδιο λογαριασμό. Έτσι μπορείτε να είστε συνδεδεμένος με τον ίδιο λογαριασμό με πόρο 'Σπίτι' και 'Δουλειά' την ίδια στιγμή. Ο πόρος με τη μεγαλύτερη προτεραιότητα θα λαμβάνει τα γεγονότα. (βλέπε και πιο κάτω)"
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ο πόρος στέλνεται στον εξυπηρετητή Jabber ώστε να διαχωριστεί το ίδιο JID σε "
+"δύο ή περισσότερα μέρη ανάλογα με τον αριθμό των εφαρμογών που είναι "
+"συνδεδεμένες στον ίδιο εξυπηρετητή με τον ίδιο λογαριασμό. Έτσι μπορείτε να "
+"είστε συνδεδεμένος με τον ίδιο λογαριασμό με πόρο 'Σπίτι' και 'Δουλειά' την "
+"ίδια στιγμή. Ο πόρος με τη μεγαλύτερη προτεραιότητα θα λαμβάνει τα γεγονότα. "
+"(βλέπε και πιο κάτω)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Αποθήκευση _φράσης πρόσβασης (περιορισμένη ασφάλεια)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 #, fuzzy
 msgid "_Adjust to status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Ε-Mail:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Όνομα:"
+
+#: ../data/glade/accounts_window.glade.h:24
 #, fuzzy
-msgid "If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account"
-msgstr "Αν έχετε 2 ή περισσότερους λογαριασμούς και έχει επιλεγεί, το Gajim θα εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Επώνυμο:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "Συ_γχώνευση λογαριασμών"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "_Μετονομασία"
+
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Τροποποίηση"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Χρήση προσαρμοσμένης θύρας:"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Αφαίρεση"
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -531,13 +711,16 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Περιγραφή</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>ΣΗΜΕΙΩΣΗ:</b> Θα πρέπει να επανεκκινήσετε το gajim για να εφαρμοστούν μερικές ρυθμίσεις"
+msgstr ""
+"<b>ΣΗΜΕΙΩΣΗ:</b> Θα πρέπει να επανεκκινήσετε το gajim για να εφαρμοστούν "
+"μερικές ρυθμίσεις"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -557,45 +740,46 @@ msgstr "Διαγράφει το Μήνυμα της ημέρας (MOTD)"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
 #, fuzzy
-msgid "Sends a message to users currently connected to this server"
-msgstr "Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
+msgid "Edit _Privacy Lists..."
+msgstr "Προσωπικές συζητήσεις"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Ορισμός MOTD"
+#, fuzzy
+msgid "Sends a message to users currently connected to this server"
+msgstr ""
+"Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Ορισμός MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Κονσόλα _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Ενημέρωση MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Ενημερώνει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr ""
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Αποστολή μηνύματος διακομιστή"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Αποστολή μονού μηνύματος"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
@@ -609,7 +793,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Συνθήκες</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Ήχοι</b>"
 
@@ -626,8 +810,7 @@ msgid "All statuses"
 msgstr "Όλες οι καταστάσεις"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
@@ -644,7 +827,7 @@ msgid "Have "
 msgstr "Έχει"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Αφανής"
 
@@ -653,7 +836,7 @@ msgid "Launch a command"
 msgstr "Εκτέλεση εντολής"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
@@ -688,7 +871,8 @@ msgid "When "
 msgstr "Όταν"
 
 #: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
@@ -756,44 +940,55 @@ msgid "when I'm in"
 msgstr "όταν είμαι στο"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Εγγραφή:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "Όνομα εικονιδίου"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Τελευταία τροποποίηση:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: ../data/glade/atom_entry_window.glade.h:7
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "You have received new entry:"
+msgstr "Προσθήκη νέας εγγραφής στο μενού"
+
+#: ../data/glade/blocked_contacts_window.glade.h:1
 #, fuzzy
-msgid "Old stories"
-msgstr "Παλιό όνομα - Κείμενο - Αριθμός"
+msgid "Blocked Contacts"
+msgstr "Επαφές"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
 #, fuzzy
-msgid "You have received new entry:"
-msgstr "Προσθήκη νέας εγγραφής στο μενού"
+msgid "<b>Message:</b>"
+msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
@@ -824,10 +1019,9 @@ msgid "Join _Group Chat"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Προσθήκη στη λίστα επαφών"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -847,39 +1041,70 @@ msgid "_Open Link in Browser"
 msgstr "_Άνοιγμα δεσμού στον περιηγητή"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Έναρξη συζήτησης"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Επαφές"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Αποστολή _αρχείου"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Συμπαγής όψη   Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Προσθήκη στη λίστα επαφών"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Ιστορικό"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Αδυναμία φόρτωσης"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Παρατηρητές"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -893,6 +1118,24 @@ msgstr "Ρυθμίσεις δωματίου"
 msgid "Edit Groups"
 msgstr "Τροποποίηση ομάδων"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Περιγραφή</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Χαρακτηριστικά διακομιστή"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
@@ -907,7 +1150,8 @@ msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχεί
 
 #: ../data/glade/filetransfers.glade.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
+msgstr ""
+"Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
 
 #: ../data/glade/filetransfers.glade.h:5
 msgid "Clean _up"
@@ -928,7 +1172,8 @@ msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λ
 #: ../data/glade/filetransfers.glade.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
+msgstr ""
+"Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
 
 #: ../data/glade/filetransfers.glade.h:10
 #, fuzzy
@@ -936,15 +1181,18 @@ msgid "Shows a list of file transfers between you and others"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
 #: ../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 "Αυτή η ενέργεια αφαιρεί μια μεταφορά αρχείου από τη λίστα. Αν η μεταφορά είναι ενεργή, τότε πρώτα διακόπτεται και μετά αφαιρείται"
+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
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -952,8 +1200,7 @@ msgstr "_Συνέχεια"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
@@ -1002,7 +1249,7 @@ msgstr "Προσαρμογή θεμάτων Gajim"
 msgid "Gone"
 msgstr "Έξω"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Ανενεργό"
 
@@ -1043,58 +1290,72 @@ msgid "_Background:"
 msgstr "Χρώμα _φόντου:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Αλλαγή _ψευδώνυμου"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Αλλαγή _θέματος"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις σε αυτό το δωμάτιο"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Ρύθμιση _δωματίου"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Ρύθμιση _δωματίου"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "_Συντονιστής"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Ενέργειες για τους συμμετέχοντες"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Διαχειριστής"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Μέλος"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Ενέργειες για τους συμμετέχοντες"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Αποστολή προσωπικού μηνύματος"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Φωνή"
 
@@ -1103,85 +1364,85 @@ msgstr "_Φωνή"
 msgid "Create new post"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Από"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Θέμα"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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 ""
 "<big><b>Καλωσήλθατε στον διαχειριστή ιστορικού του Gajim</b></big>\n"
 "\n"
-"Μπορείτε να επιλέξετε καταγραφές από τ'αριστερά ή να ερευνήσετε τη βάση δεδομένων παρακάτω.\n"
+"Μπορείτε να επιλέξετε καταγραφές από τ'αριστερά ή να ερευνήσετε τη βάση "
+"δεδομένων παρακάτω.\n"
 "\n"
 "<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>\n"
-"Αν σκοπεύετε να κάνετε μαζικές διαγραφές, σιγουρευτείτε ότι δεν τρέχει το Gajim. Γενικά να αποφύγετε να διαγράψετε από επαφές που συζητάτε αυτή τη στιγμή."
+"Αν σκοπεύετε να κάνετε μαζικές διαγραφές, σιγουρευτείτε ότι δεν τρέχει το "
+"Gajim. Γενικά να αποφύγετε να διαγράψετε από επαφές που συζητάτε αυτή τη "
+"στιγμή."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Αναζήτηση στη βάση δεδομένων"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Κατασκευή προσαρμοσμένου ερωτήματος"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Κατασκευή ερωτήματος..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Αναζήτηση"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Αναζήτηση"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Αποδοχή"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Άρνηση"
+#, fuzzy
+msgid "Search:"
+msgstr "Αναζήτηση"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Παραλήφθηκε μια πρόσκληση"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1149
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
@@ -1191,14 +1452,12 @@ msgid "Join this room automatically when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Ψευδώνυμο:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
@@ -1207,13 +1466,12 @@ msgid "Recently:"
 msgstr "Πρόσφατα:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -1227,24 +1485,45 @@ msgstr "Αυτόματη είσοδος"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την εκκίνηση"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:3
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση σελιδοδεικτών"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Εμφάνιση κατάστασης:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Τίτλος:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Ρυθμίσεις δωματίου"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Ιδιότητες</b>"
@@ -1254,47 +1533,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Σύνδεση HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Όνομα:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Κωδικός πρόσβασης:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Τύπος:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Χρήση πιστοποίησης"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "Ε_ξυπηρετητής:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
 #: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "Κρυπτογράφηση OpenPGP"
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Ενέργειες"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Αποστολή"
 
@@ -1310,36 +1627,77 @@ msgstr "<b>Επεξεργασία προχωρημένων ρυθμίσεων</b
 msgid "<b>Applications</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Ενέργειες</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Επεξεργασία κανόνα</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Μορφή μια γραμμής κουβέντας</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Επιλογές Gmail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</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
+msgid "<b>Custom</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Επιλογές Gmail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "backdrops.list"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Προχωρημένοι"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Προχωρημένοι"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1349,45 +1707,27 @@ msgstr ""
 "Μόνο αν κάποιος γράφει ένα μήνυμα\n"
 "Απενεργοποιημένες"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./απασχολ./αφανής"
-
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Γνωστό επίσης ως στυλ iChat"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
 msgstr ""
+"Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
+"απασχολ./αφανής"
 
-#: ../data/glade/preferences_window.glade.h:20
-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 will use the default one set here"
-msgstr ""
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Αυτόματα _απομακρυσμένος μετά:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Αυτόματα _μη διαθέσιμος μετά:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Αυτόματη ανίχνευση σε κάθε έναρξη του Gajim\n"
@@ -1395,318 +1735,422 @@ msgstr ""
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
 
-#: ../data/glade/preferences_window.glade.h:29
-#: ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Κουβέντα"
-
-#: ../data/glade/preferences_window.glade.h:30
-#, fuzzy
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Επιλέξτε το, μόνο αν κάποιος που δεν έχετε στη λίστα επαφών σας στέλνει spam ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid "Configure color and font of the interface"
-msgstr ""
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
+#, fuzzy
+msgid "Chat message:"
+msgstr "Μήνυμα κατά_στασης:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
 #: ../data/glade/preferences_window.glade.h:34
-msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
-
 #: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
-msgid "Displayed Chat state noti_fications:"
-msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+msgid "Display _activity of contacts in roster"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "Κάθε 5 _λεπτά"
+msgid "Display _extra email details"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Φατσούλες:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Γεγονότα"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Το Gajim μπορεί να να στέλνει και να λαμβάνει μετα-πληροφορίες σχετικές με μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες θέλετε να στέλνετε στους άλλους."
+msgid "Display m_ood of contacts in roster"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: ../data/glade/preferences_window.glade.h:45
-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 "Display status _messages of contacts in roster"
+msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
 #: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
-msgid "Gajim will automatically show new events by popping up the relative window"
-msgstr "Το Gajim θα εμφανίσει αυτόματα νέα γεγονότα αναδύοντας το ανάλογο παράθυρο"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Το Gajim μπορεί να να στέλνει και να λαμβάνει μετα-πληροφορίες σχετικές με "
+"μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
+"θέλετε να στέλνετε στους άλλους."
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά μέρος της οθόνης"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Το Gajim μπορεί να να στέλνει και να λαμβάνει μετα-πληροφορίες σχετικές με "
+"μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
+"θέλετε να στέλνετε στους άλλους."
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
+"μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που προκάλεσε το νέο γεγονός"
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: ../data/glade/preferences_window.glade.h:52
-msgid "If checked, Gajim will also include information about the sender of the new emails"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών και στις ομαδικές κουβέντες"
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
 #: ../data/glade/preferences_window.glade.h:54
-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 change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:55
-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 "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου παραθύρου την επόμενη φορά που θα εκτελεστεί"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/glade/preferences_window.glade.h:56
-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 checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
+"κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το ':)' με τις αντίστοιχες γραφικές φατσούλες"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/glade/preferences_window.glade.h:59
-msgid "Ma_nage..."
-msgstr "Δια_χείριση..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/glade/preferences_window.glade.h:60
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Επιλέξτε το, μόνο αν κάποιος που δεν έχετε στη λίστα επαφών σας στέλνει spam "
+"ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
+"όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:63
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
-"Ποτέ\n"
-"Πάντα\n"
-"Ανά λογαριασμό\n"
-"Ανά τύπο"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Ειδοποίηση όταν μια επαφή:"
+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/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "Σε κάθε _μήνυμα"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
+"':)' με τις αντίστοιχες γραφικές φατσούλες"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Παρά_θυρο ενός μηνύματος:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
 #, fuzzy
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+msgid "Ma_ke message windows compact"
+msgstr "Παρά_θυρο ενός μηνύματος:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Αναπαραγωγή _ήχων"
+msgid "Ma_nage..."
+msgstr "Δια_χείριση..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Προτιμήσεις"
+#, fuzzy
+msgid "Notifications"
+msgstr "Τροποποίηση λογαριασμού"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Εμφάνιση χρόνου:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Ειδοποίηση όταν μια επαφή:"
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Αποθήκευση _θέσης και μεγέθους για τη λίστα επαφών και για τα παράθυρα κουβέντας"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Ειδοποίηση όταν μια επαφή:"
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr ""
+msgid "Notify on new _GMail email"
+msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Προσωπικές πληροφορίες"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "Σύν_δεση"
+msgid "Play _sounds"
+msgstr "Αναπαραγωγή _ήχων"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "Αποσ_ύνδεση"
-
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Status"
-msgstr "Κατάσταση"
-
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "_Θέμα:"
+msgid "Preferences"
+msgstr "Προτιμήσεις"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
+msgid "Sign _in"
+msgstr "Σύν_δεση"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
+msgid "Sign _out"
+msgstr "Αποσ_ύνδεση"
 
 #: ../data/glade/preferences_window.glade.h:82
-#, fuzzy
-msgid "Treat all incoming messages as:"
-msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
-
-#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
-msgid "Use system _default"
-msgstr "Χρήση _προκαθορισμένου χρώματος"
+msgid "Sort contacts by status"
+msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Κατάσταση"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Όταν ληφθεί ένα νέο συμβάν (μήνυμα, αίτημα για μεταφορά αρχείου κλπ.), μπορεί να χρησιμοποιηθούν οι παρακάτω μέθοδοι για να ειδοποιηθείτε. Σημειώστε πως συμβάντα για νέα μηνύματα δημιουργούνται μόνο όταν λαμβάνονται μηνύματα από επαφές με τις οποίες δεν συζητάτε ήδη"
+#, fuzzy
+msgid "Style"
+msgstr "Πάγωσε"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
+msgid "T_heme:"
+msgstr "_Θέμα:"
 
 #: ../data/glade/preferences_window.glade.h:88
-msgid "Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Προχωρημένος έλεγχος ειδοποιήσεων..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Περιηγητής:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Διαχειριστής αρχείων:"
+#, fuzzy
+msgid "Use system _default"
+msgstr "Χρήση _προκαθορισμένου χρώματος"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Γραμματοσειρά:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
+msgid "_Browser:"
+msgstr "_Περιηγητής:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "_Εισερχόμενο μήνυμα:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Φατσούλες:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Εφαρμογή αλληλογραφίας:"
+msgid "_File manager:"
+msgstr "_Διαχειριστής αρχείων:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Ποτέ"
+msgid "_Highlight misspelled words"
+msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Ειδοποίησε με για αυτό"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Άνοιγμα..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "Ε_ξερχόμενο μήνυμα:"
+msgid "_Incoming message:"
+msgstr "_Εισερχόμενο μήνυμα:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Αναπαραγωγέας:"
+msgid "_Log status changes of contacts"
+msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Εμφάνισε το"
+msgid "_Mail client:"
+msgstr "_Εφαρμογή αλληλογραφίας:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
+msgid "_Open..."
+msgstr "_Άνοιγμα..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "Μήνυμα κατά_στασης:"
+msgid "_Outgoing message:"
+msgstr "Ε_ξερχόμενο μήνυμα:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "Διεύ_θυνση:"
+msgid "_Reset to Default Colors"
+msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "Μήνυμα κατά_στασης:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Συμμετοχή σε _ομαδική συζήτηση"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Εκτέλεση στο Τερματικό"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -1747,6 +2191,10 @@ msgstr "Όλα"
 msgid "Allow"
 msgstr "Επέτρεψε"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Άρνηση"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1755,8 +2203,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Σειρά:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1863
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr ""
 
@@ -1796,143 +2243,177 @@ msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 msgid "to view my status"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Προσθήκη κανόνα</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Περί"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "_Ορισμός Avatar"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Διεύθυνση"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Γενέθλια:"
 
 #: ../data/glade/profile_window.glade.h:4
+#: ../data/glade/vcard_information_window.glade.h:5
 #, fuzzy
-msgid "Avatar:"
-msgstr "_Ορισμός Avatar"
+msgid "<b>City:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Γενέθλια:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Πόλη:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Ήχοι</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Εταιρία:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Χώρα:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Τμήμα:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "Ε-Mail:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Επιπλέον διεύθυνση:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Οικογένεια:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #. Given Name
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
+
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Δοθέν όνομα:"
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Προσθήκη κανόνα</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
-msgstr "Προσωπ. σελίδα:"
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Ψευδώνυμο:"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Μέσο:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Τηλέφωνο:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Περισσότερα"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Συνθήκες</b>"
 
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Τ.Κ.:"
+
+#. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Προσωπικές πληροφορίες"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Ιδιότητες</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Τηλέφωνο:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Θέση:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Τ.Κ.:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Πρόθεμα:"
+#, 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:38
-#: ../src/vcard.py:273
-msgid "Role:"
-msgstr "Ρόλος:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Περί"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Νομός:"
+msgid "Click to set your avatar"
+msgstr ""
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Οδός:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Κατάληξη:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Δουλειά"
 
@@ -1948,84 +2429,133 @@ msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Αφαίρεση"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "A_sk to see his/her status"
 msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Προσθήκη ειδικής _γνωστοποίησης"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Ανάθεση κλειδιού Open_PGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Επεξεργασία _ομάδων"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:5695
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Αποστολή ενός _μηνύματος"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Αφαίρεση"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Αποστολή μονού _μηνύματος"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Αποστολή _αρχείου"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Έναρξη _συζήτησης"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028
-#: ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "Α_φαίρεση από τη λίστα επαφών"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "_Μετονομασία αρχείων"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Μετονομασία"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Συνδρομή"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "εννιά"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Λογαριασμοί"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Προσθήκη επαφής..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Προσθήκη _επαφής"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Χαρακτηριστικά διακομιστή"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2039,54 +2569,93 @@ msgstr "Συχνές ερωτήσεις (online)"
 msgid "Help online"
 msgstr "Online βοήθεια"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Όνομα προφίλ:"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Εμφάνιση _λίστας επαφών"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Περιεχόμενα"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Λογαριασμοί"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "Εύρεση _υπηρεσιών"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Ενέργειες"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1256
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Περιεχόμενα"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_Συχνές ερωτήσεις"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Αποστολή μονού _μηνύματος"
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Προβολή"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Προσθήκη _επαφής"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Πληροφορίες επαφής"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Αναζήτηση"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Μετάβαση"
@@ -2095,10 +2664,6 @@ msgstr "_Μετάβαση"
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Φιλτράρισμα:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Εγγραφή σε"
@@ -2159,12 +2724,17 @@ msgstr "Αμερική/Πορτ-Ο-Πρενς"
 #: ../data/glade/subscription_request_window.glade.h:2
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
+msgstr ""
+"Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
 #: ../data/glade/subscription_request_window.glade.h:3
 #, fuzzy
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μη μπορεί να γνωρίζει πότε είστε συνδεδεμένος"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μη μπορεί να γνωρίζει πότε "
+"είστε συνδεδεμένος"
 
 #: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
@@ -2174,10 +2744,31 @@ msgstr "Αίτηση εγγραφής"
 msgid "_Deny"
 msgstr "_Άρνηση"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
@@ -2190,58 +2781,73 @@ msgstr "Εμφάνιση _λίστας επαφών"
 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:5
-msgid "Ask:"
-msgstr "Ζητείται:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Εφαρμογή:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Πόρος:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Περιγραφή</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Ρύθμιση _δωματίου"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Επικοινωνία"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "Λειτ. Σύστημα:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Πόρος:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Κατάσταση:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Εγγραφή:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Περισσότερα"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Καταγραφή ιστορικού συζητήσεων"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Επιλογή Εικόνας"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2251,11 +2857,6 @@ msgstr "<b>Κίνηση Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Είσοδος δεδομένων XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ενεργοποίηση"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2274,15 +2875,29 @@ msgstr "_Μήνυμα"
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Όνομα:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Προσθήκη ειδικής _γνωστοποίησης"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Επώνυμο:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Ανάθεση κλειδιού Open_PGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Επεξεργασία _ομάδων"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Μετονομασία"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Επεξεργασία λογαριασμού..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2292,530 +2907,3252 @@ msgstr "Τοπικό jid:"
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Πόρος:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Κατάσταση:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Επεξεργασία λογαριασμού"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Χρήση προσαρμοσμένης θύρας:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Πληροφορίες επαφής"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Ενεργό"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Ανενεργό"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Ακέραιος"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Όνομα προτίμησης"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Είδος"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:137
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Κενή)"
 
-#. we talk about password
-#: ../src/advanced.py:240
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Μυστικό"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Αγγλικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Βουλγαρικά"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Εληνικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Βρετανικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Εσπεράντο"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Γαλλικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Νορβηγικά (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Νορβηγικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Πολωνέζικα"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά Βραζιλίας"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ρώσικα"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Γερμανικά"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Σλοβάκικα"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Σουηδικά"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
 
-#: ../src/chat_control.py:208
-#: ../src/dialogs.py:1517
-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 export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Αν αυτή δεν είναι η γλώσσα για την οποία επιθυμείτε να έχετε υπογράμμιση ορθογραφικών λαθών, τότε παρακαλείστε να καθορίσετε την $LANG όπως της αρμόζει. Πχ. για Ελληνικά κάντε export LANG=el_GR ή export LANG=el_GR.UTF-8 στο ~/.bash_profile ή για όλους τους χρήστες στο /etc/profile.\n"
-"\n"
-"Η υπογράμμιση ορθογραφικών λαθών απενεργοποιήθηκε"
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:270
-#: ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:271
-#: ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:852
-msgid "Chats"
-msgstr "Συζητήσεις"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "Άγνωστος τύπος %s "
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#, fuzzy
+msgid "Unknown Title"
+msgstr "Άγνωστος τύπος %s "
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#, fuzzy
+msgid "Unknown Source"
+msgstr "Άγνωστος τύπος %s "
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "Αριθμός - Καλλιτέχνης - Τίτλος"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Χρήση πιστοποίησης"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+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:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Εντολές: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
+"προσώπου (π.χ. /%s χοροπηδάει)."
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+"Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1406
-#: ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:785
-#: ../src/gajim.py:786
-#: ../src/gajim.py:1130
-#: ../src/roster_window.py:332
-#: ../src/roster_window.py:410
-#: ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508
-#: ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890
-#: ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900
-#: ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73
-#: ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "εκτός λίστας επαφών"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:1551
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το μήνυμα θα χαθεί."
+#: ../src/chat_control.py:2226
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
+"μήνυμα θα χαθεί."
 
-#: ../src/config.py:137
-#: ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "Ο %(nick)s είναι τώρα %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "δημιουργία βάσης δεδομένων ιστορικού"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Το Gajim τώρα θα κλείσει"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "δημιουργία φακέλου %s"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Αλλαγή πληροφοριών κατάστασης"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Αλλαγή κατάστασης"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Ελεύθερος για κουβέντα"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Συνδεδεμένος"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Μην ενοχλείτε"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Περιγραφή παρουσίας:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Η κατάσταση άλλαξε."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Ομαδικές συζητήσεις"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "Ο/Η %s μπήκε στο δωμάτιο"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Ομαδικές συζητήσεις"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d μη αναγνωσμένο μήνυμα"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr ""
+"Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
+"απομακρυσμένος."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Απομακρυσμένος λόγω αδράνειας"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr ""
+"Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
+"διαθέσιμος."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Μη διαθέσιμος λόγω αδράνειας"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+#, fuzzy
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Λίστα (χωρισμένη με κενά) των γραμμών (λογαριασμοί και ομάδες) που έχουν "
+"συμπτυχθεί"
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Προεπιλογή"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
+"* * δεν θα αφαιρεθούν."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
+"ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
+"ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
+"'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
+"το gajim-remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
+
+#: ../src/common/config.py:186
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
+"κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
+
+#: ../src/common/config.py:187
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
+"κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
+"περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+
+#: ../src/common/config.py:218
+#, fuzzy
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
+
+#: ../src/common/config.py:219
+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 ""
+"Αν είναι αληθές, το Gajim κλείνει όταν πατιέται το κουμπί Χ του διαχειριστή "
+"παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
+"στην μπάρα ειδοποιήσεων."
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Αν είναι αληθές, το Gajim θα εμφανίζει ένα εικονίδιο σε κάθε καρτέλα που "
+"έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
+"κίνηση."
+
+#: ../src/common/config.py:222
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
+"είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
+"άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
+
+#: ../src/common/config.py:229
+#, fuzzy
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Αν είναι ψευδές, το Gajim δε θα τυπώνει γραμμή σχετική με την κατάσταση στα "
+"παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
+"κατάστασης."
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr ""
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
+"να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
+
+#: ../src/common/config.py:240
+#, fuzzy
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Το jabberd 1.4 δεν δέχεται πληροφορίες sha όταν γίνεται σύνδεση σε ένα "
+"δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Καθορίζει σε ποιο παράθυρο θα εμφανίζονται τα νέα μηνύματα.\n"
+"'always' - Όλα τα μηνύματα σε ένα παράθυρο.\n"
+"'never' - Κάθε μήνυμα στο δικό του παράθυρο.\n"
+"'peracct' - Κάθε λογαριασμός έχει το δικό του παράθυρο μηνυμάτων.\n"
+"'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
+"απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
+
+#: ../src/common/config.py:244
+#, fuzzy
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
+
+#: ../src/common/config.py:245
+#, fuzzy
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+"Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
+
+#: ../src/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Ειδική παράκαμψη για το jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Αν ενεργοποιηθεί, το Gajim θα χρησιμοποιήσει την IP και τους ενδιάμεσους "
+"διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
+"αρχείων."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'ναι', 'όχι', ή 'και τα δύο'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'ναι', 'όχι' ή ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Κοιμάμαι"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Πίσω σύντομα"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Πίσω σε λίγα λεπτά."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Τρώω"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Ταινία"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Βλέπω μια ταινία."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Δουλειά"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Δουλεύω."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Είμαι στο τηλέφωνο."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Έξω"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Είμαι διαθέσιμος."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Είμαι ελεύθερος για κουβέντα."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Επιστρέφω αμέσως."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Δεν είμαι διαθέσιμος."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Μην ενοχλείτε."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Γεια χαρά!"
+
+#: ../src/common/config.py:441
+#, fuzzy
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
+"από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr ""
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "πράσινο"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "μανάβικο"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "ζεστό"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "θαλασσί"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Λάθος διακομιστής"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
+"%s"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Η επέκταση δεν υποστηρίζεται"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Δεν υπάρχει τέτοια συζήτηση."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Δεν είστε στη λίστα μελών."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "Ο %s μόλις σας εξουσιοδότησε"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα επαφών "
+"σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
+"jabberstudio.org για να το αφαιρέσετε"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+msgid "Unable to decode issuer public key"
+msgstr ""
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Επανασύνδεση χειροκίνητα."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Άγνωστη έκδοση του D-Bus: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Μη έγκυρη απόκριση"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Άγνωστη έκδοση του D-Bus: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Θέμα: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Παρατηρητές"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Μεταφορές"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "Εκτέλεση στο Τερματικό"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Μη διαθέσιμη υπηρεσία: Το Gajim δεν τρέχει ή δεν είναι ενεργοποιημένο το "
+"remote_control"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
+"λείπει"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
+"Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "ένα"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "δύο"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "τρία"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "τέσσερα"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "πέντε"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "έξι"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "επτά"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "οκτώ"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "εννιά"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "δέκα"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "έντεκα"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "δώδεκα"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 ακριβώς"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "$0 και πέντε"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "$0 και δέκα"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "$0 και τέταρτο"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "$0 και είκοσι"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "$0 και εικοσιπέντε"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "$0 και μισή"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "$1 παρά εικοσιπέντε"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "$1 παρά είκοσι"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "$1 παρά τέταρτο"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "$1 παρά δέκα"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "$1 παρά πέντε"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 ακριβώς"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Νύχτα"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Νωρίς το πρωί"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Πρωί"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Σχεδόν μεσημέρι"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Μεσημέρι"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Απόγευμα"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Απόγευμα"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Αργά το απόγευμα"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Αρχή εβδομάδας"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Μέση της εβδομάδας"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Τέλος εβδομάδας"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Σαββατοκύριακο!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Απαιτείται η διεύθυνση του διακομιστή."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "Απα_σχολημένος"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Απασχολημένος"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Μη διαθέσιμος"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "Διαθέσιμος για _κουβέντα"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Διαθέσιμος για κουβέντα"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Διαθέσιμος"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Διαθέσιμος"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Συνδέεται"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "Α_πομακρυσμένος"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "Απ_οσυνδεδεμένος"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Αποσυνδεδεμένος"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "Αόρατ_ος"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?κατάσταση επαφής: Άγνωστη"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Καμία"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Προς"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Και τα δυο"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Τίποτα"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Εγγραφή"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Κανένας"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Διαχειριστές"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Διαχειριστής"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Συμμετέχοντες"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Συμμετέχων"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Επισκέπτες"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Επισκέπτης"
+
+#: ../src/common/helpers.py:358
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Κανένας"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Ιδιοκτήτης"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Διαχειριστής"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Μέλος"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "έχει την προσοχή του στην κουβέντα"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "κάνει κάτι άλλο"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "γράφει ένα μήνυμα..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "έκλεισε το παράθυρο ή την καρτέλα"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Αποστολή μηνύματος"
+msgstr[1] "Αποστολή μηνύματος"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "Από %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "Από %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "Από %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "κυανό"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "δημιουργία βάσης δεδομένων ιστορικού"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Λογαριασμός gajim %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Παύση"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Έντονα"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Έχει"
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Συζητήσεις"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Έντονα"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Περιεχόμενα"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Ολοκληρώθηκε"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Περιεχόμενα"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Ανενεργό"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "_Πίσω"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Διαγραφή"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Απενεργοποιημένο"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Απενεργοποιημένο"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "_Πίσω"
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Ενεργό"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Ομάδα"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "Ε_ξυπηρετητής:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "μήνυμα"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Ενεργό"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Αφανής"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "ένα"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "Ε_ξυπηρετητής:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Γερμανικά"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Τροποποίηση"
+
+#: ../src/common/pep.py:85
+#, fuzzy
+msgid "Nervous"
+msgstr "_Πίσω"
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Αποσυνδεδεμένος"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Ομάδα"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "έντεκα"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Πάγωσε"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Τελευταία τροποποίηση:"
+
+#: ../src/common/pep.py:98
+#, fuzzy
+msgid "Serious"
+msgstr "_Πίσω"
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Ψευδώνυμο"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Κοιμάμαι"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Οδός:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Εγγεγραμμένος"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Χρόνος"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Υπογράμμιση"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Λάθος διακομιστής"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Απόγευμα"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Σύνθεση"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Πρωί"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "όλους στην ομάδα"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Δουλειά"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Απόγευμα"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Διώχνοντας τον %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Συμμετοχή"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Δουλειά"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Δουλειά"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "Από"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Τρώω"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Αλλαγή θέματος"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Διώχνοντας τον %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Τρώω"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Δουλειά"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "λιτό"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Διώχνοντας τον %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Τρώω"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "Αποσ_ύνδεση"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Τρώω"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Αιτία"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Αιτία"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Κοιμάμαι"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Δουλειά"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Τρώω"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Βλέπω μια ταινία."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Τρώω"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Είμαι στο τηλέφωνο."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Μεταφέρεται"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Σύνθεση"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Συνδεδεμένος"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Δουλειά"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Σύνθεση"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Δουλειά"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, fuzzy, python-format
+msgid "Unable to bind to port %s."
+msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
+"επανασυνδεθείτε."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Σφάλμα avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Κάθε %s _λεπτά"
+msgid "Error while adding service. %s"
+msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: ../src/config.py:353
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:684
-#: ../src/gajim.py:2165
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Ενεργοποίηση"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:685
-#: ../src/gajim.py:2166
+#: ../src/config.py:651
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:1046
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Επόμενο μήνυμα ελήφθη"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:1051
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1062
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/config.py:1261
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Όνομα"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Νέα είσοδος τώρα;"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
+"συνδεθείτε ξανά."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Αδιάβαστα γεγονότα"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr ""
+"Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
+"λογαριασμού."
+
+#: ../src/config.py:1693
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1311
-#: ../src/config.py:1905
-msgid "Unread events"
-msgstr "Αδιάβαστα γεγονότα"
-
-#: ../src/config.py:1312
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
-msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή γεγονότα."
+msgstr ""
+"Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
+"γεγονότα."
 
-#: ../src/config.py:1316
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1317
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς σας. Παρακαλώ, επιλέξτε άλλο όνομα."
+#: ../src/config.py:1717
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
+"σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1321
-#: ../src/config.py:1325
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1322
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1326
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1334
-#: ../src/config.py:1340
-#: ../src/config.py:1350
-#: ../src/config.py:3013
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Διαχείριση λογαριασμών"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1341
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
-msgstr "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
+msgstr ""
+"Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1400
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:1401
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1529
-#: ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Επιστρέφω αμέσως."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1539
-msgid "Relogin now?"
-msgstr "Νέα είσοδος τώρα;"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:1540
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να συνδεθείτε ξανά."
+#: ../src/config.py:2076
+msgid "OpenPGP Key Selection"
+msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Επιλέξτε το κλειδί OpenPGP σας"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1567
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
-msgstr "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να τροποποιείτε τις προσωπικές σας πληροφορίες."
+msgstr ""
+"Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
+"τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:1574
-#: ../src/dialogs.py:1131
-#: ../src/dialogs.py:1317
-#: ../src/disco.py:417
-#: ../src/profile_window.py:313
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1575
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
-msgstr "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας πληροφορίες."
+msgstr ""
+"Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
+"πληροφορίες."
 
-#: ../src/config.py:1579
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1580
+#: ../src/config.py:2102
 #, fuzzy
 msgid "Your server can't save your personal information."
-msgstr "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να τροποποιείτε τις προσωπικές σας πληροφορίες."
-
-#: ../src/config.py:1604
-#: ../src/config.py:3401
-msgid "Failed to get secret keys"
-msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
-
-#: ../src/config.py:1605
-#: ../src/config.py:3402
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
-
-#: ../src/config.py:1608
-#: ../src/config.py:3405
-msgid "OpenPGP Key Selection"
-msgstr "Επιλογή κλειδιού OpenPGP"
-
-#: ../src/config.py:1609
-#: ../src/config.py:3406
-msgid "Choose your OpenPGP key"
-msgstr "Επιλέξτε το κλειδί OpenPGP σας"
-
-#. Name column
-#: ../src/config.py:1839
-#: ../src/disco.py:741
-#: ../src/disco.py:1467
-#: ../src/disco.py:1705
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Όνομα"
-
-#: ../src/config.py:1842
-msgid "Server"
-msgstr "Εξυπηρετητής"
-
-#: ../src/config.py:1906
-msgid "Read all pending events before removing this account."
-msgstr "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του λογαριασμού."
-
-#: ../src/config.py:1943
-#, fuzzy, python-format
-msgid "You have opened chat in account %s"
-msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
-
-#: ../src/config.py:1944
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
+"Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
+"τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2003
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2004
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2238
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2240
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2312
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2348
-#: ../src/disco.py:748
-#: ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2365
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2388
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2823,11 +6160,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2390
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2391
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2835,11 +6172,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2393
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2394
+#: ../src/config.py:2457
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2848,11 +6185,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2397
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2860,7 +6197,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2876,315 +6213,400 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2503
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2520
-#: ../src/roster_window.py:2733
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2521
-#: ../src/roster_window.py:2729
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2522
-#: ../src/roster_window.py:2734
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2536
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2537
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:2624
+#: ../src/config.py:2690
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2692
+#: ../src/config.py:2758
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:2725
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2726
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά αφαιρέστε το σελιδοδείκτη."
+#: ../src/config.py:2792
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
+"αφαιρέστε το σελιδοδείκτη."
 
-#: ../src/config.py:2988
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2989
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
-msgstr "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου λογαριασμού."
-
-#: ../src/config.py:2999
-#: ../src/dialogs.py:1336
-msgid "Invalid password"
-msgstr "Μη έγκυρος κωδικός"
-
-#: ../src/config.py:3000
-msgid "You must enter a password for the new account."
-msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
-
-#: ../src/config.py:3004
-#: ../src/dialogs.py:1341
-msgid "Passwords do not match"
-msgstr "Οι κωδικοί δεν ταιριάζουν"
-
-#: ../src/config.py:3005
-#: ../src/dialogs.py:1342
-msgid "The passwords typed in both fields must be identical."
-msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
+msgstr ""
+"Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
+"λογαριασμού."
 
-#: ../src/config.py:3024
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Διπλότυπο αναγνωριστικό Jabber"
 
-#: ../src/config.py:3025
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
 
-#: ../src/config.py:3042
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3043
-#: ../src/config.py:3078
+#: ../src/config.py:3119 ../src/config.py:3308
 #, fuzzy
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Μπορείτε να αλλάξετε τις προχωρημένες επιλογές για το λογαριασμό σας επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Μπορείτε να αλλάξετε τις προχωρημένες επιλογές για το λογαριασμό σας "
+"επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
+"Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3077
-msgid "Your new account has been created successfully"
-msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Επαφή ήδη στη λίστα επαφών"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3153
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/conversation_textview.py:271
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+msgstr ""
+"Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
+"φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:678
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:712
 #, 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:386
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:734
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:790
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Ένα πρόγραμμα για το Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα εικονιδίου"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID συστήματος:"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Ορισμός MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Μήνυμα κατάστασης"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
+"σας. Παρακαλώ, επιλέξτε άλλο όνομα."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 #, fuzzy
 msgid "GG Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο λογαριασμό %s"
+msgstr ""
+"Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
+"λογαριασμό %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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:779
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -3192,72 +6614,111 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:909
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
-
-#: ../src/dialogs.py:910
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+#: ../src/dialogs.py:1210
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1061
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:1064
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:1124
-#: ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:1132
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
-msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε συνδεδεμένος."
+msgstr ""
+"Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
+"συνδεδεμένος."
 
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1215
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr ""
+"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:1216
-#: ../src/dialogs.py:1222
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
-msgstr "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
+msgstr ""
+"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1794
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:1229
+#: ../src/dialogs.py:1795
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:1268
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Εξυπηρετητής"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr ""
+"Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
+"συνδεδεμένος."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:1271
+#: ../src/dialogs.py:1955
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3267,530 +6728,852 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1296
-#: ../src/dialogs.py:1655
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:1297
-#: ../src/dialogs.py:1656
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:1306
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:1318
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:1337
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Μη έγκυρος κωδικός"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Οι κωδικοί δεν ταιριάζουν"
+
+#: ../src/dialogs.py:2025
+msgid "The passwords typed in both fields must be identical."
+msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1384
-#: ../src/notify.py:211
-#: ../src/notify.py:415
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:1386
-#: ../src/notify.py:219
-#: ../src/notify.py:417
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:238
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:223
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:1389
-#: ../src/notify.py:230
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:1389
-#: ../src/gajim.py:1225
-#: ../src/notify.py:428
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:1391
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1393
-#: ../src/gajim.py:1197
-#: ../src/gajim.py:1354
-#: ../src/notify.py:424
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1395
-#: ../src/gajim.py:1417
-#: ../src/gajim.py:1439
-#: ../src/gajim.py:1456
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:1396
-#: ../src/gajim.py:1420
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:1398
-#: ../src/gajim.py:1094
-#: ../src/notify.py:430
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:1400
-#: ../src/notify.py:203
-#: ../src/notify.py:432
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1587
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1592
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1615
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1687
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1688
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:1732
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:1857
+#: ../src/dialogs.py:2568
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2572
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:1909
+#: ../src/dialogs.py:2628
 #, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:1912
+#: ../src/dialogs.py:2633
 #, fuzzy, python-format
-msgid "Order: %s, action: %s"
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:2041
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2858
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:2139
+#: ../src/dialogs.py:2860
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2930
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:2210
+#: ../src/dialogs.py:2931
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Ο/Η %s μπήκε στο δωμάτιο"
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:2328
-#: ../src/dialogs.py:2373
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:2363
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
 #. # means number
-#: ../src/dialogs.py:2508
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2514
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Κατάσταση"
 
-#: ../src/dialogs.py:2635
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "όταν είμαι"
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Άλλα"
 
-#: ../src/disco.py:102
-#: ../src/disco.py:103
-#: ../src/disco.py:1253
-#: ../src/gajim.py:539
-#: ../src/roster_window.py:271
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:368
-#: ../src/roster_window.py:451
-#: ../src/roster_window.py:483
-#: ../src/roster_window.py:485
-#: ../src/roster_window.py:3896
-#: ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Μεταφορές"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:643
-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:657
+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:647
-#: ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1143
-#: ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Εκτέλεση εντολής..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+msgid "Node"
+msgstr "Κόμβος"
+
+#: ../src/disco.py:1883
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Διαχειριστής ιστορικού"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Το μήνυμα στάλθηκε"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Κρυπτογράφηση OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Εισερχόμενο μήνυμα:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Γενικά"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Χαρακτηριστικά διακομιστή"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Αρχείο"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Χρόνος"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173
-#: ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Άνοιγμα αρχείου μενού"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Παραλήπτης: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 #, fuzzy
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Η μεταφορά αρχείου σταμάτησε από την επαφή της άλλης πλευράς"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Περιγραφή: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:705
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:707
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το αντικαταστήσετε."
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
+"αντικαταστήσετε."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:721
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:722
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Αποθήκευση αρχείου ως..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3798,90 +7581,105 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: ../src/filetransfers_window.py:544
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:568
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:570
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Η libglade λείπει από το GTK+"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την τελευταία σταθερή έκδοση από %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
+"τελευταία σταθερή έκδοση από %s"
 
-#: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν υποστήριξη για την libglade."
+#: ../src/gajim.py:199
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
+"υποστήριξη για την libglade."
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Το Gajim χρειάζεται την pywin32 για να εκτελεστεί"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3889,446 +7687,738 @@ msgstr ""
 "Φαίνεται πως εκτελείται ήδη μια διεργασία του Gajim.\n"
 "Σίγουρα να εκτελεστεί;"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Απαιτείται φράση πρόσβασης"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Εσφαλμένη φράση πρόσβασης"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
+"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:393
-#: ../src/notify.py:434
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Δέχεστε αυτό το αίτημα;"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/gajim.py:710
-#, python-format
-msgid "Subject: %s"
-msgstr "Θέμα: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:755
-#: ../src/gajim.py:768
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gajim.py:801
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:802
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gajim.py:810
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:811
-msgid "You will always see him or her as offline."
-msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:854
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:855
-#: ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/gajim.py:1004
-#: ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "Ο %s είναι τώρα %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1007
-#: ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "Ο %s είναι τώρα %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1104
-msgid "Your passphrase is incorrect"
-msgstr "H φράση πρόσβασης είναι λανθασμένη"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
 
-#: ../src/gajim.py:1105
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "H φράση πρόσβασης είναι λανθασμένη"
+
+#: ../src/gajim.py:1561
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1563
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
 msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1219
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Από: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gajim.py:1444
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1457
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Σε κάθε _μήνυμα"
+
+#: ../src/gajim.py:1898
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gajim.py:1575
+#: ../src/gajim.py:1899
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+#, fuzzy
+msgid "Error."
+msgstr "Σφάλμα:"
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Σύνδεση"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "Μη_ν με ξαναρωτήσεις"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:2113
-#, fuzzy
-msgid "Network Manager support not available"
-msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/gajim.py:2188
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το άρθρωμα του gnome.ui)"
+#: ../src/gajim.py:2998
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
+"κεντρικό παράθυρο."
+
+#: ../src/gajim-remote.py:79
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
 #, fuzzy
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια ξεχωριστή γραμμή"
-
-#: ../src/gajim-remote.py:85
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:188
-#: ../src/gajim-remote.py:197
-#: ../src/gajim-remote.py:204
-#: ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:222
-#: ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:247
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
+"ξεχωριστή γραμμή"
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
+msgstr ""
+"μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
+"εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "μήνυμα"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote.py:100
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "αλλαγή κατάστασης του λογαριασμού \"account\". Εάν δεν έχει καθοριστεί, δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
+#: ../src/gajim-remote.py:113
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"αλλαγή κατάστασης του λογαριασμού \"account\". Εάν δεν έχει καθοριστεί, "
+"δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
+"ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια επαφή"
+msgstr ""
+"Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
+"επαφή"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
-msgstr "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του λογαριασμού"
+msgstr ""
+"εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
+"λογαριασμού"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:128
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Αποστολή νέου μηνύματος σε μια επαφή από την λίστα επαφών. Το κλειδί OpenPGP και ο λογαριασμός είναι προαιρετικά. Εάν θέλετε να καθορίσετε μόνο το 'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε ''."
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Αποστολή νέου μηνύματος σε μια επαφή από την λίστα επαφών. Το κλειδί OpenPGP "
+"και ο λογαριασμός είναι προαιρετικά. Εάν θέλετε να καθορίσετε μόνο το "
+"'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
+"''."
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο κλειδί"
+msgstr ""
+"εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
+"κλειδί"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:141
 #, fuzzy
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Αποστολή νέου μηνύματος σε μια επαφή από την λίστα επαφών. Το κλειδί OpenPGP και ο λογαριασμός είναι προαιρετικά. Εάν θέλετε να καθορίσετε μόνο το 'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε ''."
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Αποστολή νέου μηνύματος σε μια επαφή από την λίστα επαφών. Το κλειδί OpenPGP "
+"και ο λογαριασμός είναι προαιρετικά. Εάν θέλετε να καθορίσετε μόνο το "
+"'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
+"''."
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "θέμα"
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "το JID της επαφής που θα λάβει το μήνυμα"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του έχει προσδιοριστεί"
+msgstr ""
+"Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
+"έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
+msgstr ""
+"Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί λογαριασμός)"
+msgstr ""
+"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
+"λογαριασμός)"
 
-#: ../src/gajim-remote.py:209
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί λογαριασμός)"
+#: ../src/gajim-remote.py:231
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
+"λογαριασμός)"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:238
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:242
 #, fuzzy
 msgid "Opens 'Start Chat' dialog"
 msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
 
-#: ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:248
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../src/gajim-remote.py:229
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
+#: ../src/gajim-remote.py:251
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:257
 #, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:259
 #, fuzzy
 msgid "uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Σύνδεση σε νέο δωμάτιο"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Δωμάτιο:"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "κωδικός πρόσβασης"
 
 #: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Οι κωδικοί δεν ταιριάζουν"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Το Gajim εκτελείται ήδη"
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4337,29 +8427,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Χρήση: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:358
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:362
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4368,969 +8460,1205 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:443
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:461
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Θέμα"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντος θέματος"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "όνομα θέματος"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντος θέματος"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Προσωπική συζήτηση"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Προσωπικές συζητήσεις"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:152
 #, fuzzy, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Ομαδική συζήτηση"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Ομαδικές συζητήσεις"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Ιστορικό συζητήσεων"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Σύνδεση"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:1142
 #, 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:840
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Συσχέτιση: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "Ο %s είναι τώρα γνωστός ως %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/groupchat_control.py:1063
-#: ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174
-#: ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1510
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117
-#: ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
-
-#: ../src/groupchat_control.py:1251
-#, python-format
-msgid "Commands: %s"
-msgstr "Εντολές: %s"
-
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1656
 #, fuzzy, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Χρήση: /%s <ψευδώνυμο|JID> [λόγος], απαγορεύει το JID από το δωμάτιο. Το ψευδώνυμο του χρήστη μπορεί να αντικατασταθεί, αλλά όχι εάν περιέχει \"@\". Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Χρήση: /%s <ψευδώνυμο|JID> [λόγος], απαγορεύει το JID από το δωμάτιο. Το "
+"ψευδώνυμο του χρήστη μπορεί να αντικατασταθεί, αλλά όχι εάν περιέχει \"@\". "
+"Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
+"υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1663
 #, fuzzy, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το συγκεκριμένο χρήστη."
-
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
-
-#: ../src/groupchat_control.py:1266
-#, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το λόγο εάν έχει προσδιοριστεί."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
+"συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_control.py:1269
+#: ../src/groupchat_control.py:1669
 #, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
+"λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1675
 #, fuzzy, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας προαιρετικά και λόγο."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
+"προαιρετικά και λόγο."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1679
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
-
-#: ../src/groupchat_control.py:1280
-#, fuzzy, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
+"δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1683
 #, fuzzy, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου προσώπου (π.χ. /%s χοροπηδάει)."
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
+"δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1692
 #, fuzzy, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
+"και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1697
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1701
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1705
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1305
-#, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες εντολές."
-
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1708
 #, python-format
-msgid "No help info for /%s"
-msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
+"εντολές."
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1837
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1361
+#: ../src/groupchat_control.py:1839
 #, fuzzy
-msgid "If you close this window, you will be disconnected from this group chat."
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1365
-#: ../src/roster_window.py:4036
-msgid "Do _not ask me again"
-msgstr "Μη_ν με ξαναρωτήσεις"
-
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/groupchat_control.py:1435
-msgid "Bookmark already set"
-msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
-
-#: ../src/groupchat_control.py:1436
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
+msgid "Destroying %s"
+msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1445
-msgid "Bookmark has been added successfully"
-msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1446
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο κεντρικό παράθυρο."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1575
-#: ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Εντοπίστηκε ένα προγραμματιστικό σφάλμα"
 
-#: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Πιθανότατα δεν είναι κρίσιμο, αλλά πρέπει να αναφερθεί στους προγραμματιστές σε κάθε περίπτωση."
+#: ../src/gtkexcepthook.py:47
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Πιθανότατα δεν είναι κρίσιμο, αλλά πρέπει να αναφερθεί στους προγραμματιστές "
+"σε κάθε περίπτωση."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Αναφορά σφάλματος"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "<b>Λεπτομέρειες</b>"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:334
+#: ../src/gtkgui_helpers.py:396
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Αδυναμία εγγραφής στο %s. Δε θα υπάρξει υποστήριξη για το διαχειριστή συνεδριών"
+msgstr ""
+"Αδυναμία εγγραφής στο %s. Δε θα υπάρξει υποστήριξη για το διαχειριστή "
+"συνεδριών"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:649
+#: ../src/gtkgui_helpers.py:733
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/gtkgui_helpers.py:650
+#: ../src/gtkgui_helpers.py:734
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
-#: ../src/gtkgui_helpers.py:651
+#: ../src/gtkgui_helpers.py:735
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:750
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/gtkgui_helpers.py:751
+#: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Η εικόνα δεν είναι δυνατό να αποθηκευτεί στη μορφή %(type)s. Να αποθηκευτεί ως %(new_filename)s;"
+msgstr ""
+"Η εικόνα δεν είναι δυνατό να αποθηκευτεί στη μορφή %(type)s. Να αποθηκευτεί "
+"ως %(new_filename)s;"
 
-#: ../src/gtkgui_helpers.py:760
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Επαφές"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Ημερομηνία"
 
 #. holds nickname
-#: ../src/history_manager.py:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: ../src/history_manager.py:186
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM ΤΡΕΧΕΙ)"
+#: ../src/history_manager.py:224
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
+"ΤΡΕΧΕΙ)"
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Ο κατανεμημένος στη βάση δεδομένων χώρος δεν θα ελευθερωθεί, αλλά θα γίνει αξιοποιήσιμος πάλι. Αν πράγματι θέλετε να μειώσετε το μέγεθος της βάσης δεδομένων επιλέξτε ΝΑΙ, αλλιώς επιλέξτε ΟΧΙ.\n"
+"Ο κατανεμημένος στη βάση δεδομένων χώρος δεν θα ελευθερωθεί, αλλά θα γίνει "
+"αξιοποιήσιμος πάλι. Αν πράγματι θέλετε να μειώσετε το μέγεθος της βάσης "
+"δεδομένων επιλέξτε ΝΑΙ, αλλιώς επιλέξτε ΟΧΙ.\n"
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "Θέλετε σίγουρα να διαγράψετε το αρχείο καταγραφής της επιλεγμένης επαφής;"
-msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
+msgstr[0] ""
+"Θέλετε σίγουρα να διαγράψετε το αρχείο καταγραφής της επιλεγμένης επαφής;"
+msgstr[1] ""
+"Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Σφάλμα:"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "Ο %(nick)s είναι τώρα %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "Η εικόνα είναι πολύ μεγάλη"
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Συζητήσεις"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Ομαδικές συζητήσεις"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Προσωπικές συζητήσεις"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Νέο μήνυμα από %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Γενικά"
+
+#: ../src/profile_window.py:56
 #, fuzzy
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:107
-#: ../src/profile_window.py:210
-#: ../src/profile_window.py:219
-msgid "Click to set your avatar"
-msgstr ""
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Διαδρομή αρχείου"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
 #. keep identation
-#: ../src/profile_window.py:137
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:252
 #, fuzzy
 msgid "Information received"
 msgstr "Περισσότερες πληροφορίες..."
 
-#: ../src/profile_window.py:314
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
-msgstr "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής σας"
+msgstr ""
+"Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
+"σας"
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:335
 #, fuzzy
 msgid "Sending profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:350
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του \"%s\""
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/profile_window.py:349
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, δοκιμάστε αργότερα."
+#: ../src/profile_window.py:358
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
+"δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:171
-#: ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:344
-#: ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Παρατηρητές"
-
-#: ../src/roster_window.py:692
-#: ../src/roster_window.py:3201
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "με χρήση του λογαριασμού %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "στο λογαριασμό %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "χρήση του λογαριασμού %s"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr ""
+"Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "για το λογαριασμό %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1009
-#, fuzzy
-msgid "_Manage Bookmarks..."
-msgstr "/Προβολή/_Διαχείριση"
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "για το λογαριασμό %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Διαχειριστής ιστορικού"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:1068
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "_Είσοδος σε Ομαδική Συζήτηση"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+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:1398
-#: ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
+
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
+"ενεργοποιημένο το ιστορικό."
+
+#: ../src/roster_window.py:2522
 #, fuzzy
 msgid "You must read them before removing this transport."
-msgstr "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του λογαριασμού."
+msgstr ""
+"Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
+"λογαριασμού."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:1403
+#: ../src/roster_window.py:2526
 #, fuzzy
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη μεταφορά."
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
+"μεταφορά."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:1411
+#: ../src/roster_window.py:2534
 #, fuzzy, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports:%s"
-msgstr "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη μεταφορά."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
+"μεταφορά."
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:1517
+#: ../src/roster_window.py:2735
 #, fuzzy
-msgid "Remove also all contacts in this group from your roster"
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:1782
-#: ../src/roster_window.py:2043
+#: ../src/roster_window.py:3128
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
+
+#: ../src/roster_window.py:3132
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
+"συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
+
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
 #, fuzzy
-msgid "_New group chat"
-msgstr "Αρχηγός ομάδας παραθύρων"
+msgid "Do you want to continue?"
+msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:1913
-msgid "I would like to add you to my roster"
-msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
+#: ../src/roster_window.py:3141
+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:2088
-#: ../src/roster_window.py:2135
+#: ../src/roster_window.py:3144
+msgid "I want this contact to know my status after removal"
+msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
+
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3148
 #, fuzzy
-msgid "Send Group M_essage"
-msgstr "Αρχηγός ομάδας παραθύρων"
+msgid "Contacts will be removed from your roster"
+msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:2114
-msgid "Re_name"
-msgstr "_Μετονομασία"
+#: ../src/roster_window.py:3152
+#, fuzzy, 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:2141
-msgid "To all users"
-msgstr "Σε όλους τους χρήστες"
+#: ../src/roster_window.py:3191
+msgid "No account available"
+msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:2144
-msgid "To all online users"
-msgstr "Σε όλους τους συνδεδεμένους χρήστες"
+#: ../src/roster_window.py:3192
+msgid "You must create an account before you can chat with other contacts."
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/roster_window.py:3708
+msgid "Metacontacts storage not supported by your server"
+msgstr ""
+
+#: ../src/roster_window.py:3710
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
 
-#: ../src/roster_window.py:2180
-msgid "_Log on"
-msgstr "_Σύνδεση"
+#: ../src/roster_window.py:3784
+#, fuzzy
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
 
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "_Αποσύνδεση"
+#: ../src/roster_window.py:3786
+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:2312
-#: ../src/roster_window.py:2383
-msgid "_Change Status Message"
-msgstr "Α_λλαγή μηνύματος κατάστασης"
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:2455
-msgid "Authorization has been sent"
-msgstr "Η εξουσιοδότηση έχει σταλεί"
+#: ../src/roster_window.py:3910
+#, 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:2456
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
+msgid "using account %s"
+msgstr "με χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:2476
-msgid "Subscription request has been sent"
-msgstr "Η αίτηση εγγραφής έχει σταλεί"
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "στο λογαριασμό %s"
 
-#: ../src/roster_window.py:2477
+#. disco
+#: ../src/roster_window.py:4679
 #, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
+msgid "using %s account"
+msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:2489
-msgid "Authorization has been removed"
-msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+#, fuzzy
+msgid "_Manage Bookmarks..."
+msgstr "/Προβολή/_Διαχείριση"
 
-#: ../src/roster_window.py:2490
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
+msgid "of account %s"
+msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
+msgid "for account %s"
+msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2684
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:2689
-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:4865
+msgid "Publish Tune"
+msgstr ""
 
-#: ../src/roster_window.py:2692
-msgid "I want this contact to know my status after removal"
-msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
 
-#. several contact to remove at the same time
-#: ../src/roster_window.py:2696
+#: ../src/roster_window.py:4879
 #, fuzzy
-msgid "Contacts will be removed from your roster"
-msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
+msgid "Activity"
+msgstr "Ενεργό"
 
-#: ../src/roster_window.py:2700
-#, fuzzy, 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:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:2732
-msgid "Gnomekeyring is installed but not correctly started (environment variable probably not correctly set)"
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
 msgstr ""
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2760
-#: ../src/common/connection.py:596
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:2777
-msgid "Passphrase Required"
-msgstr "Απαιτείται φράση πρόσβασης"
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:2778
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
-#: ../src/roster_window.py:2783
-msgid "Save passphrase"
-msgstr "Αποθήκευση της φράσης πρόσβασης"
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:2791
-msgid "Wrong Passphrase"
-msgstr "Εσφαλμένη φράση πρόσβασης"
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2792
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Αποστολή μονού μηνύματος"
 
-#: ../src/roster_window.py:2849
-#: ../src/roster_window.py:2909
-msgid "You are participating in one or more group chats"
-msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Μεταφορές"
 
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2910
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../src/roster_window.py:2867
-msgid "No account available"
-msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
 
-#: ../src/roster_window.py:2868
-msgid "You must create an account before you can chat with other contacts."
-msgstr "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με άλλες επαφές."
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:2966
-#, fuzzy, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "Αριθμός - Καλλιτέχνης - Τίτλος"
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:3395
-#: ../src/roster_window.py:3402
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε ενεργοποιημένο το ιστορικό."
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:3986
-msgid "Metacontacts storage not supported by your server"
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Είσοδος σε Ομαδική Συζήτηση"
+
+#: ../src/roster_window.py:6207
+msgid "Change Status Message..."
+msgstr "Αλλαγή μηνύματος κατάστασης..."
+
+#: ../src/search_window.py:93
+msgid "Waiting for results"
 msgstr ""
 
-#: ../src/roster_window.py:3988
-msgid "Your server does not support storing metacontacts information. So those information will not be save on next reconnection."
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
 msgstr ""
 
-#: ../src/roster_window.py:4030
-#, fuzzy
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με άλλες επαφές."
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
 
-#: ../src/roster_window.py:4032
-msgid "Metacontacts are a way to regroup several contacts in one line. Generally it is used when the same person has several Jabber accounts or transport accounts."
+#: ../src/session.py:124
+msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/roster_window.py:4199
+#: ../src/session.py:238
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Προσθήκη %s στην ομάδα %s"
+msgid "Subject: %s"
+msgstr "Θέμα: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
 
-#: ../src/roster_window.py:4206
+#: ../src/session.py:400
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
 
-#: ../src/roster_window.py:4393
-msgid "Change Status Message..."
-msgstr "Αλλαγή μηνύματος κατάστασης..."
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
 
-#: ../src/systray.py:144
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID συστήματος:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr "από τις %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Σύνδεση"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Αποσύνδεση επαφής"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Δωμάτιο:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Ενεργό"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Τύπος:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5338,1395 +9666,522 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Συσχέτιση: "
-
-#: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν ενδιαφέρεστε για την παρουσία του/της"
-
-#: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν ενδιαφέρεται για τη δική σας"
-
-#: ../src/vcard.py:289
-msgid "You and the contact are interested in each other's presence information"
-msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
-
-#. None
-#: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η ενδιαφέρεται για εσάς"
-
-#: ../src/vcard.py:299
-msgid "You are waiting contact's answer about your subscription request"
-msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
-
 #: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " πόρος με προτεραιότητα"
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "δημιουργία βάσης δεδομένων ιστορικού"
-
-#: ../src/common/check_paths.py:89
-#: ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, fuzzy, python-format
-msgid "%s is a file but it should be a directory"
-msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
-
-#: ../src/common/check_paths.py:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Το Gajim τώρα θα κλείσει"
-
-#: ../src/common/check_paths.py:115
-#, fuzzy, python-format
-msgid "%s is a directory but should be a file"
-msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "δημιουργία φακέλου %s"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Αλλαγή πληροφοριών κατάστασης"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Αλλαγή κατάστασης"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr ""
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Ελεύθερος για κουβέντα"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Συνδεδεμένος"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr ""
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Μην ενοχλείτε"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr ""
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Περιγραφή παρουσίας:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Η κατάσταση άλλαξε."
-
-#: ../src/common/commands.py:179
-#, fuzzy, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s: %(message)s"
-
-#: ../src/common/commands.py:183
-#, fuzzy
-msgid "You have not joined a groupchat."
-msgstr "Ο/Η %s μπήκε στο δωμάτιο"
-
-#: ../src/common/commands.py:189
-#, fuzzy
-msgid "Leave Groupchats"
-msgstr "Ομαδικές συζητήσεις"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr ""
-
-#: ../src/common/commands.py:194
-#, fuzzy
-msgid "Groupchats"
-msgstr "Ομαδικές συζητήσεις"
-
-#: ../src/common/commands.py:230
-#, fuzzy
-msgid "You leaved the following groupchats:"
-msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
-
-#: ../src/common/config.py:56
-#, fuzzy
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε απομακρυσμένος."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Απομακρυσμένος λόγω αδράνειας"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη διαθέσιμος."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Μη διαθέσιμος λόγω αδράνειας"
-
-#: ../src/common/config.py:83
 #, fuzzy
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Λίστα (χωρισμένη με κενά) των γραμμών (λογαριασμοί και ομάδες) που έχουν συμπτυχθεί"
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr ""
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Εφαρμογές</b>"
 
-#: ../src/common/config.py:92
+#: ../src/vcard.py:319
 msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr ""
+"Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
+"ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/common/config.py:93
-msgid "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is 'sometimes'."
-msgstr ""
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
-
-#: ../src/common/config.py:97
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα * * δεν θα αφαιρεθούν."
-
-#: ../src/common/config.py:100
-msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-
-#: ../src/common/config.py:109
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr ""
-
-#: ../src/common/config.py:110
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr ""
-
-#: ../src/common/config.py:133
-msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr ""
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr ""
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr ""
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
-
-#: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
-
-#: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή 'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας το gajim-remote."
-
-#: ../src/common/config.py:154
-msgid "If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection."
-msgstr ""
-
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+#: ../src/vcard.py:321
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr ""
+"Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
+"ενδιαφέρεται για τη δική σας"
 
-#: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr ""
+#: ../src/vcard.py:323
+msgid "You and the contact are interested in each other's presence information"
+msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
-#: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
+#. None
+#: ../src/vcard.py:325
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr ""
+"Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
+"ενδιαφέρεται για εσάς"
 
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
-
-#: ../src/common/config.py:160
-#, fuzzy
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
-
-#: ../src/common/config.py:161
-#, fuzzy
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
-
-#: ../src/common/config.py:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
+#: ../src/vcard.py:332
+msgid "You are waiting contact's answer about your subscription request"
+msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
-
-#: ../src/common/config.py:175
-#, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
-
-#: ../src/common/config.py:189
-#, fuzzy
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
-
-#: ../src/common/config.py:190
-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 "Αν είναι αληθές, το Gajim κλείνει όταν πατιέται το κουμπί Χ του διαχειριστή παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου στην μπάρα ειδοποιήσεων."
-
-#: ../src/common/config.py:191
-#, fuzzy
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " πόρος με προτεραιότητα"
 
-#: ../src/common/config.py:192
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Αν είναι αληθές, το Gajim θα εμφανίζει ένα εικονίδιο σε κάθε καρτέλα που έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει κίνηση."
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/common/config.py:193
-#, fuzzy
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει "
+#~ "κάποιο"
 
-#: ../src/common/config.py:195
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say "
+#~ "μπροστά)"
 
-#: ../src/common/config.py:196
 #, fuzzy
-msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message."
-msgstr "Αν είναι ψευδές, το Gajim δε θα τυπώνει γραμμή σχετική με την κατάσταση στα παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα κατάστασης."
-
-#: ../src/common/config.py:197
-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 ""
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
+#~ "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr ""
+#~ msgid "Encryption enabled"
+#~ msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr ""
+#~ msgid "Encryption disabled"
+#~ msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr ""
+#~ msgid "<b>Please fill in the data for your new account</b>"
+#~ msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr ""
+#~ msgid "_Retype Password:"
+#~ msgstr "Επανά_ληψη κωδικού:"
 
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr ""
+#~ msgid "_Use proxy"
+#~ msgstr "_Χρήση μεσολαβητή"
 
-#: ../src/common/config.py:205
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
-
-#: ../src/common/config.py:207
 #, fuzzy
-msgid "Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences."
-msgstr "Το jabberd 1.4 δεν δέχεται πληροφορίες sha όταν γίνεται σύνδεση σε ένα δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Αν έχετε 2 ή περισσότερους λογαριασμούς και έχει επιλεγεί, το Gajim θα "
+#~ "εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
 
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-#, fuzzy
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before the changes will take effect."
-msgstr ""
-"Καθορίζει σε ποιο παράθυρο θα εμφανίζονται τα νέα μηνύματα.\n"
-"'always' - Όλα τα μηνύματα σε ένα παράθυρο.\n"
-"'never' - Κάθε μήνυμα στο δικό του παράθυρο.\n"
-"'peracct' - Κάθε λογαριασμός έχει το δικό του παράθυρο μηνυμάτων.\n"
-"'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
 
-#: ../src/common/config.py:211
 #, fuzzy
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
+#~ msgid "Old stories"
+#~ msgstr "Παλιό όνομα - Κείμενο - Αριθμός"
 
-#: ../src/common/config.py:212
-#, fuzzy
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
-#: ../src/common/config.py:213
-#, fuzzy
-msgid "Hides the buttons in group chat window."
-msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Συμπαγής όψη   Alt+C"
 
-#: ../src/common/config.py:214
-#, fuzzy
-msgid "Hides the buttons in two persons chat window."
-msgstr "Αποκρύπτει τα κουμπιά στο παράθυρο προσωπικού διαλόγου"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις σε αυτό το δωμάτιο"
 
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
+#~ msgid "Build custom query"
+#~ msgstr "Κατασκευή προσαρμοσμένου ερωτήματος"
 
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
+#~ msgid "Query Builder..."
+#~ msgstr "Κατασκευή ερωτήματος..."
 
-#: ../src/common/config.py:217
-#, fuzzy
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
+#~ msgid "Accept"
+#~ msgstr "Αποδοχή"
 
-#: ../src/common/config.py:218
-msgid "In a chat, show the nickname at the beginning of a line only when it's not the same person talking than in previous message."
-msgstr ""
+#~ msgid "Invitation Received"
+#~ msgstr "Παραλήφθηκε μια πρόσκληση"
 
-#: ../src/common/config.py:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr ""
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Μορφή μια γραμμής κουβέντας</b>"
 
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Προσαρμογή διεπαφής</b>"
 
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
+#~ msgid "Also known as iChat style"
+#~ msgstr "Γνωστό επίσης ως στυλ iChat"
 
-#: ../src/common/config.py:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr ""
+#~ msgid "Chat"
+#~ msgstr "Κουβέντα"
 
-#: ../src/common/config.py:223
-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:224
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr ""
-
-#: ../src/common/config.py:225
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr ""
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Κάθε 5 _λεπτά"
 
-#: ../src/common/config.py:226
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr ""
+#~ msgid "Events"
+#~ msgstr "Γεγονότα"
 
-#: ../src/common/config.py:237
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr ""
-
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Ειδική παράκαμψη για το jabberd2"
-
-#: ../src/common/config.py:270
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Αν ενεργοποιηθεί, το Gajim θα χρησιμοποιήσει την IP και τους ενδιάμεσους διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά αρχείων."
-
-#: ../src/common/config.py:329
 #, fuzzy
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
-
-#: ../src/common/config.py:330
-#: ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr ""
-
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr ""
-
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "'ναι', 'όχι', ή 'και τα δύο'"
-
-#: ../src/common/config.py:341
-#: ../src/common/config.py:343
-#: ../src/common/config.py:344
-#: ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "'ναι', 'όχι' ή ''"
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Κοιμάμαι"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Πίσω σύντομα"
-
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Πίσω σε λίγα λεπτά."
-
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Τρώω"
-
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
-
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Ταινία"
-
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Βλέπω μια ταινία."
-
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Δουλειά"
-
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Δουλεύω."
-
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Είμαι στο τηλέφωνο."
-
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Έξω"
-
-#: ../src/common/config.py:360
-msgid "I'm out enjoying life."
-msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr ""
+#~ "Το Gajim θα εμφανίσει αυτόματα νέα γεγονότα αναδύοντας το ανάλογο παράθυρο"
 
-#: ../src/common/config.py:364
-msgid "I'm available."
-msgstr "Είμαι διαθέσιμος."
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
+#~ "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../src/common/config.py:365
-msgid "I'm free for chat."
-msgstr "Είμαι ελεύθερος για κουβέντα."
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω "
+#~ "δεξιά μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../src/common/config.py:367
-msgid "I'm not available."
-msgstr "Δεν είμαι διαθέσιμος."
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που προκάλεσε το νέο "
+#~ "γεγονός"
 
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Μην ενοχλείτε."
+#~ 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 ""
+#~ "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου "
+#~ "παραθύρου την επόμενη φορά που θα εκτελεστεί"
 
-#: ../src/common/config.py:369
-#: ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Γεια χαρά!"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Ποτέ\n"
+#~ "Πάντα\n"
+#~ "Ανά λογαριασμό\n"
+#~ "Ανά τύπο"
 
-#: ../src/common/config.py:379
 #, fuzzy
-msgid "Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname."
-msgstr "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../src/common/config.py:380
-msgid "Sound to play when any MUC message arrives."
-msgstr ""
+#~ msgid "Print time:"
+#~ msgstr "Εμφάνιση χρόνου:"
 
-#: ../src/common/config.py:389
-#: ../src/common/optparser.py:193
-msgid "green"
-msgstr "πράσινο"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Αποθήκευση _θέσης και μεγέθους για τη λίστα επαφών και για τα παράθυρα "
+#~ "κουβέντας"
 
-#: ../src/common/config.py:393
-#: ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "μανάβικο"
+#~ msgid "Show only in _roster"
+#~ msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "ζεστό"
+#~ msgid "The auto away status message"
+#~ msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "θαλασσί"
+#~ msgid "The auto not available status message"
+#~ msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr ""
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Λάθος διακομιστής"
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Όταν ληφθεί ένα νέο συμβάν (μήνυμα, αίτημα για μεταφορά αρχείου κλπ.), "
+#~ "μπορεί να χρησιμοποιηθούν οι παρακάτω μέθοδοι για να ειδοποιηθείτε. "
+#~ "Σημειώστε πως συμβάντα για νέα μηνύματα δημιουργούνται μόνο όταν "
+#~ "λαμβάνονται μηνύματα από επαφές με τις οποίες δεν συζητάτε ήδη"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "The host you configured as the ft_override_host_to_send advanced option is not valid, so ignored."
-msgstr ""
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Προχωρημένος έλεγχος ειδοποιήσεων..."
 
-#: ../src/common/connection_handlers.py:590
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά %s"
+#~ msgid "_Font:"
+#~ msgstr "_Γραμματοσειρά:"
 
-#: ../src/common/connection_handlers.py:1540
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
+#~ msgid "_Never"
+#~ msgstr "_Ποτέ"
 
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1602
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1625
-msgid "Unable to join group chat"
-msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../src/common/connection_handlers.py:1603
-msgid "A password is required to join this group chat."
-msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
+#~ msgid "_Player:"
+#~ msgstr "_Αναπαραγωγέας:"
 
-#: ../src/common/connection_handlers.py:1606
-msgid "You are banned from this group chat."
-msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
+#~ msgid "_Pop it up"
+#~ msgstr "_Εμφάνισε το"
 
-#: ../src/common/connection_handlers.py:1609
-msgid "Such group chat does not exist."
-msgstr "Δεν υπάρχει τέτοια συζήτηση."
+#~ msgid "_URL:"
+#~ msgstr "Διεύ_θυνση:"
 
-#: ../src/common/connection_handlers.py:1612
-msgid "Group chat creation is restricted."
-msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
+#~ msgid "Address"
+#~ msgstr "Διεύθυνση"
 
-#: ../src/common/connection_handlers.py:1615
-msgid "Your registered nickname must be used."
-msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
-
-#: ../src/common/connection_handlers.py:1618
-msgid "You are not in the members list."
-msgstr "Δεν είστε στη λίστα μελών."
+#~ msgid "City:"
+#~ msgstr "Πόλη:"
 
-#: ../src/common/connection_handlers.py:1626
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
-"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
+#~ msgid "Company:"
+#~ msgstr "Εταιρία:"
 
-#: ../src/common/connection_handlers.py:1676
-msgid "I would like to add you to my roster."
-msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+#~ msgid "Country:"
+#~ msgstr "Χώρα:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1697
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Ο %s μόλις σας εξουσιοδότησε"
+#~ msgid "Given:"
+#~ msgstr "Δοθέν όνομα:"
 
-#: ../src/common/connection_handlers.py:1699
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+#~ msgid "Homepage:"
+#~ msgstr "Προσωπ. σελίδα:"
 
-#: ../src/common/connection_handlers.py:1701
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+#~ msgid "Middle:"
+#~ msgstr "Μέσο:"
 
-#: ../src/common/connection_handlers.py:1871
-#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα επαφών σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru.jabberstudio.org για να το αφαιρέσετε"
+#~ msgid "Position:"
+#~ msgstr "Θέση:"
 
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
+#~ msgid "Prefix:"
+#~ msgstr "Πρόθεμα:"
 
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Επανασύνδεση χειροκίνητα."
+#~ msgid "Role:"
+#~ msgstr "Ρόλος:"
 
-#: ../src/common/connection.py:187
-#: ../src/common/connection.py:214
-#, fuzzy, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
+#~ msgid "State:"
+#~ msgstr "Νομός:"
 
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Μη έγκυρη απόκριση"
+#~ msgid "Suffix:"
+#~ msgstr "Κατάληξη:"
 
-#: ../src/common/connection.py:405
-#: ../src/common/connection.py:440
-#: ../src/common/connection.py:898
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+#~ msgid "_Remove from Roster"
+#~ msgstr "Α_φαίρεση από τη λίστα επαφών"
 
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Έγινε σύνδεση με το διακομιστή %s:%s με %s"
+#~ msgid "A_ccounts"
+#~ msgstr "_Λογαριασμοί"
 
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
+#~ msgid "_Filter:"
+#~ msgstr "_Φιλτράρισμα:"
 
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
+#~ msgid "Ask:"
+#~ msgstr "Ζητείται:"
 
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
+#~ msgid "Client:"
+#~ msgstr "Εφαρμογή:"
 
-#: ../src/common/connection.py:495
-#, fuzzy
-msgid "Error while removing privacy list"
-msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
+#~ msgid "OS:"
+#~ msgstr "Λειτ. Σύστημα:"
 
-#: ../src/common/connection.py:496
-#, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Desactivate it and try again."
-msgstr ""
+#~ msgid "Subscription:"
+#~ msgstr "Εγγραφή:"
 
-#. We didn't set a passphrase
-#: ../src/common/connection.py:594
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Αν αυτή δεν είναι η γλώσσα για την οποία επιθυμείτε να έχετε υπογράμμιση "
+#~ "ορθογραφικών λαθών, τότε παρακαλείστε να καθορίσετε την $LANG όπως της "
+#~ "αρμόζει. Πχ. για Ελληνικά κάντε export LANG=el_GR ή export LANG=el_GR.UTF-"
+#~ "8 στο ~/.bash_profile ή για όλους τους χρήστες στο /etc/profile.\n"
+#~ "\n"
+#~ "Η υπογράμμιση ορθογραφικών λαθών απενεργοποιήθηκε"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:636
-msgid "invisible"
-msgstr "αόρατος"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Κάθε %s _λεπτά"
 
-#: ../src/common/connection.py:637
-msgid "offline"
-msgstr "αποσυνδεδεμένος"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/common/connection.py:638
-#, python-format
-msgid "I'm %s"
-msgstr "Είμαι %s"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
 
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:729
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/common/connection.py:785
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Θέμα: %s\n"
-"%s"
+#~ msgid "%s is now %s"
+#~ msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/common/connection.py:924
-msgid "Not fetched because of invisible status"
-msgstr ""
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Από: %(from_address)s"
 
-#: ../src/common/contacts.py:271
 #, fuzzy
-msgid "Not in roster"
-msgstr "Εκτέλεση στο Τερματικό"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Μη διαθέσιμη υπηρεσία: Το Gajim δεν τρέχει ή δεν είναι ενεργοποιημένο το remote_control"
-
-#: ../src/common/exceptions.py:38
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python λείπει"
-
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
-"Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "ένα"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "δύο"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "τρία"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "τέσσερα"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "πέντε"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "έξι"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "επτά"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "οκτώ"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "εννιά"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "δέκα"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "έντεκα"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "δώδεκα"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 ακριβώς"
-
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 και πέντε"
-
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 και δέκα"
-
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 και τέταρτο"
-
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 και είκοσι"
-
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 και εικοσιπέντε"
-
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 και μισή"
-
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$1 παρά εικοσιπέντε"
-
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "$1 παρά είκοσι"
-
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "$1 παρά τέταρτο"
-
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "$1 παρά δέκα"
-
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "$1 παρά πέντε"
-
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 ακριβώς"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Νύχτα"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Νωρίς το πρωί"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Πρωί"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Σχεδόν μεσημέρι"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Μεσημέρι"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Απόγευμα"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Απόγευμα"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Αργά το απόγευμα"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Αρχή εβδομάδας"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Μέση της εβδομάδας"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Τέλος εβδομάδας"
-
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Σαββατοκύριακο!"
-
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
-
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Απαιτείται η διεύθυνση του διακομιστή."
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
-
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "Απα_σχολημένος"
-
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Απασχολημένος"
-
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_Μη διαθέσιμος"
-
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "Διαθέσιμος για _κουβέντα"
-
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Διαθέσιμος για κουβέντα"
-
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Διαθέσιμος"
-
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Διαθέσιμος"
-
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Συνδέεται"
-
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "Α_πομακρυσμένος"
-
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "Απ_οσυνδεδεμένος"
-
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Αποσυνδεδεμένος"
-
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "Αόρατ_ος"
-
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "?κατάσταση επαφής: Άγνωστη"
-
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
-
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "Καμία"
-
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Προς"
-
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Και τα δυο"
-
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "Τίποτα"
-
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Εγγραφή"
-
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "Κανένας"
-
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Διαχειριστές"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
+#~ "άρθρωμα του gnome.ui)"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Διαχειριστής"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Χρήση: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Συμμετέχοντες"
+#~ msgid "Private Chat"
+#~ msgstr "Προσωπική συζήτηση"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Συμμετέχων"
+#~ msgid "Group Chat"
+#~ msgstr "Ομαδική συζήτηση"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Επισκέπτες"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Επισκέπτης"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/helpers.py:301
 #, fuzzy
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Κανένας"
-
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Ιδιοκτήτης"
-
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Διαχειριστής"
-
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Μέλος"
-
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "έχει την προσοχή του στην κουβέντα"
-
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "κάνει κάτι άλλο"
-
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "γράφει ένα μήνυμα..."
-
-#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
-
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "έκλεισε το παράθυρο ή την καρτέλα"
-
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d μη αναγνωσμένο μήνυμα"
-msgstr[1] "%d μη αναγνωσμένα μηνύματα"
-
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
-msgstr[1] "%d μη αναγνωσμένα μεμονωμένα μηνύματα"
+#~ msgid "_New group chat"
+#~ msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d μη αναγνωσμένο μήνυμα"
-msgstr[1] "%d μη αναγνωσμένα μηνύματα"
+#~ msgid "_Log on"
+#~ msgstr "_Σύνδεση"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d μη αναγνωσμένο προσωπικό μήνυμα"
-msgstr[1] "%d μη αναγνωσμένα προσωπικά μηνύματα"
+#~ msgid "Log _off"
+#~ msgstr "_Αποσύνδεση"
 
-#: ../src/common/helpers.py:909
-#: ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "Save passphrase"
+#~ msgstr "Αποθήκευση της φράσης πρόσβασης"
 
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Προσθήκη %s στην ομάδα %s"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: ../src/common/optparser.py:188
-#: ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "κυανό"
-
-#: ../src/common/optparser.py:306
 #, fuzzy
-msgid "migrating logs database to indices"
-msgstr "δημιουργία βάσης δεδομένων ιστορικού"
-
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Λογαριασμός gajim %s"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Αποκρύπτει τα κουμπιά στο παράθυρο προσωπικού διαλόγου"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Η σύνδεση με το διακομιστή δεν ήταν εφικτή."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Έγινε σύνδεση με το διακομιστή %s:%s με %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr ""
+#~ msgid "invisible"
+#~ msgstr "αόρατος"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr ""
+#~ msgid "offline"
+#~ msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να επανασυνδεθείτε."
+#~ msgid "I'm %s"
+#~ msgstr "Είμαι %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Σφάλμα avahi"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
+#~ msgstr[1] "%d μη αναγνωσμένα μεμονωμένα μηνύματα"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d μη αναγνωσμένο μήνυμα"
+#~ msgstr[1] "%d μη αναγνωσμένα μηνύματα"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr ""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d μη αναγνωσμένο προσωπικό μήνυμα"
+#~ msgstr[1] "%d μη αναγνωσμένα προσωπικά μηνύματα"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, fuzzy, python-format
-msgid "Unable to bind to port %d."
-msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, fuzzy, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Η σύνδεση με το διακομιστή δεν ήταν εφικτή."
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "Με_τά από ψευδώνυμο:"
+
 #~ msgid "B_efore nickname:"
 #~ msgstr "Π_ριν το ψευδώνυμο:"
+
 #~ msgid "_After time:"
 #~ msgstr "Μετά α_πό χρόνο:"
+
 #~ msgid "_Before time:"
 #~ msgstr "_Πριν από χρόνο:"
 
 #, fuzzy
 #~ msgid "Security error connecting to \"%s\""
 #~ msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
 #~ msgid "_Account:"
 #~ msgstr "_Λογαριασμός:"
+
 #~ msgid "Add"
 #~ msgstr "Προσθήκη"
+
 #~ msgid "Away "
 #~ msgstr "Απομακρυσμένος"
+
 #~ msgid "Down"
 #~ msgstr "Κάτω"
+
 #~ msgid "List of special notifications settings"
 #~ msgstr "Λίστα ειδικών ρυθμίσεων ειδοποιήσεων"
+
 #~ msgid "Not Available "
 #~ msgstr "Μη διαθέσιμος"
+
 #~ msgid "Up"
 #~ msgstr "Πάνω"
+
 #~ msgid "Contact _Info"
 #~ msgstr "Πλη_ροφορίες επαφής"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Ανάκτηση"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Μη έγκυρο δωμάτιο ή όνομα διακομιστή"
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Άγνωστη έκδοση του D-Bus: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Μεταφορά ιστορικού..."
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
 #~ msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
+
 #~ msgid "Role: "
 #~ msgstr "Ρόλος: "
+
 #~ msgid "Since %s"
 #~ msgstr "Από τις %s"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr ""
 #~ "Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
-#~ msgid "Personal details"
-#~ msgstr "Προσωπικές πληροφορίες"
+
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
 #~ msgstr ""
 #~ "Ο ήχος που θα παιχθεί όταν ληφθεί οποιοδήποτε μήνυμα MUC. (Αυτή η ρύθμιση "
 #~ "ισχύει μόνο εάν είναι ορισμένη η notify_on_all_muc_messages)"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Αυτόματη εξουσιοδότηση επαφής"
+
 #~ msgid "Send File"
 #~ msgstr "Αποστολή αρχείου"
-#~ msgid "Underline"
-#~ msgstr "Υπογράμμιση"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "Σύνδεση σε _νέο δωμάτιο..."
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr ""
-#~ "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
-
-#, fuzzy
-#~ msgid "<b>Home</b>"
-#~ msgstr "<b>Ιστορικό</b>"
-
-#, fuzzy
-#~ msgid "<b>Job</b>"
-#~ msgstr "<b>Ιστορικό</b>"
 
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
@@ -6736,21 +10191,18 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ msgid "<b>Telephone</b>"
 #~ msgstr "<b>Περιγραφή</b>"
 
-#, fuzzy
-#~ msgid "<b>Work</b>"
-#~ msgstr "<b>Ιστορικό</b>"
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Διαγραφή Μηνύματος της Ημέρας"
 
-#, fuzzy
-#~ msgid "I want a notification popup:"
-#~ msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 #~ msgid "I want to listen to:"
 #~ msgstr "Θέλω να ακούσω:"
+
 #~ msgid "Send _New Message..."
 #~ msgstr "_Νέο Μήνυμα..."
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "Ορισμός Μηνύματος της Ημέρας"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "Ενημέρωση Μηνύματος της Ημέρας"
 
@@ -6797,102 +10249,125 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #, fuzzy
 #~ msgid "_Work:"
 #~ msgstr "Δουλειά"
+
 #~ msgid "_XML Console..."
 #~ msgstr "Κονσόλα _XML..."
 
 #, fuzzy
 #~ msgid "_Zip/Postal Code:"
 #~ msgstr "Τ.Κ.:"
-#~ msgid "Choose Avatar"
-#~ msgstr "Επιλογή Εικόνας"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr ""
 #~ "Να χρησιμοποιείται η συμπαγής όψη όταν ανοίγετε ένα παράθυρο κουβέντας"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr ""
 #~ "Χρήση συμπαγούς προβολής κατά το άνοιγμα παραθύρου ομαδικής κουβέντας"
-#~ msgid "plain"
-#~ msgstr "λιτό"
+
 #~ msgid "Send"
 #~ msgstr "Αποστολή"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr "Ο/Η %(nickname)s στο δωμάτιο %(room_name)s σας έστειλε ένα μήνυμα."
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "Ο/Η %s σας έστειλε ένα νέο μήνυμα."
 
 #, fuzzy
 #~ msgid "GUI Migration failed"
 #~ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Το ιστορικό έχει μεταφερθεί στη βάση δεδομένων με επιτυχία."
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr ""
-#~ "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή "
-#~ "γνωστοποίησης"
 
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Έναργξη Κουβέντας με χρήση του λογαριασμού %s"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr ""
 #~ "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
+
 #~ msgid "Size: "
 #~ msgstr "Mέγεθος: "
+
 #~ msgid "Session bus is not available"
 #~ msgstr "To Session bus δεν είναι διαθέσιμο"
+
 #~ msgid "Sound"
 #~ msgstr "Ήχος"
+
 #~ msgid "Image"
 #~ msgstr "Εικόνα"
-#~ msgid "From %s"
-#~ msgstr "Από %s"
+
 #~ msgid "To %s"
 #~ msgstr "σε %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr ""
 #~ "Έχετε προσκληθεί στο δωμάτιο %(room_jid)s από τον/την %(contact_jid)s"
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "Διαχείριση Συμβόλων"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "Ή διαλέξτε από τα προκαθορισμένα μηνύματα:"
+
 #~ msgid "Use _emoticons"
 #~ msgstr "_Χρήση συμβόλων"
+
 #~ msgid "_Set Image..."
 #~ msgstr "_Ορισμός Εικόνας..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "Αλλαγή σε %s"
+
 #~ msgid "using account "
 #~ msgstr "χρήση του λογαριασμού"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "Το μέγεθος αρχείου της εικόνας \"%s\" είναι πολύ μεγάλο"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "Το αρχείο δεν μπορεί να είναι πάνω από 32 kilobytes."
+
 #~ msgid "Timeout"
 #~ msgstr "Λήξη χρονικού ορίου"
+
 #~ msgid "account: "
 #~ msgstr "λογαριασμός: "
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά το δωμάτια."
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr ""
 #~ "Ενεργοποίηση/Απενεργοποίηση ειδοποίησης για όταν ολοκληρωθεί μια μεταφορά "
 #~ "αρχείου"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "Αφαίρεση επιλεγμένης μεταφοράς αρχείου"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "Διακόπτεται η επιλεγμένη μεταφορά αρχείου"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr ""
 #~ "Εάν κλείσετε αυτή την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 #~ "μήνυμα θα χαθεί."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Η τελευταία ομάδα δεν μπορεί να αφαιρεθεί"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Πρέπει να υπάρχει τουλάχιστον μια ομάδα επαφών."
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6900,24 +10375,29 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ msgstr ""
 #~ "Η pysqlite2 (επίσης γνωστή ως python-sqlite2) λείπει. Παρακαλώ "
 #~ "εγκαταστήστε την pysqlite2"
-#~ msgid "Image is too big"
-#~ msgstr "Η εικόνα είναι πολύ μεγάλη"
+
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
 #~ msgstr ""
 #~ "Η εικόνα για τα σύμβολα πρέπει να είναι μικρότερη ή ίση με 24 pixel σε "
 #~ "μήκος και 24 pixel σε ύψος."
+
 #~ msgid "<b>Changes in latest version</b>"
 #~ msgstr "<b>Αλλαγές στην τελευταία έκδοση</b>"
+
 #~ msgid "Check for new _version on Gajim startup"
 #~ msgstr "Έλεγχος για _νέα έκδοση κατά την εκκίνηση του Gajim"
+
 #~ msgid "Log history"
 #~ msgstr "Καταγραφή ιστορικού"
+
 #~ msgid "New version of Gajim available"
 #~ msgstr "Μια νέα έκδοση του Gajim είναι διαθέσιμη"
+
 #~ msgid "Open Download Page"
 #~ msgstr "Άνοιγμα Σελίδας Λήψης"
+
 #~ msgid ""
 #~ "It is the first time you run Gajim since the way logs are stored has "
 #~ "changed. Gajim can migrate your logs at this state. Migrate?"
@@ -6925,28 +10405,36 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ "Αυτή είναι η πρώτη φορά που τρέχετε το Gajim μετά την αλλαγή του τρόπου "
 #~ "αποθήκευσης του ιστορικού των συζητήσεων. Το Gajim μπορεί τώρα να "
 #~ "μετατρέψει το αποθηκευμένο ιστορικό. Να γίνει η μετατροπή;"
+
 #~ msgid "Session bus is not available."
 #~ msgstr "Ο δίαυλος του session δεν είναι διαθέσιμος."
 
 #, fuzzy
 #~ msgid "with account "
 #~ msgstr "λογαριασμός: "
+
 #~ msgid "Chat with"
 #~ msgstr "Κουβέντα με"
+
 #~ msgid "as %s"
 #~ msgstr "ως %s"
+
 #~ msgid "as "
 #~ msgstr "ως "
 
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Νέο Μήνυμα"
+
 #~ msgid "Re_quest Authorization from"
 #~ msgstr "Aί_τηση για εξουσιοδότηση από"
+
 #~ msgid "Send Authorization to"
 #~ msgstr "Αποστολή Εξουσιοδότησης σε"
+
 #~ msgid "Log presences in _contact's log file"
 #~ msgstr "Αποθήκευση παρουσιών στο αρ_χείο με το ιστορικό της επαφής"
+
 #~ msgid "Log presences in an _external file"
 #~ msgstr "Αποθήκευση παρουσιών σε _εξωτερικό αρχείο"
 
@@ -6958,6 +10446,7 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ "Ο λογαριασμός προστέθηκε με επιτυχία.\n"
 #~ "Μπορείτε να δείτε όλες τις ρυθμίσεις του λογαριασμού σας κάνοντας "
 #~ "\"Επεξεργασία->Λογαριασμοί\" από το κεντρικό παράθυρο"
+
 #~ msgid ""
 #~ "When a new message is received which is not from a contact already in a "
 #~ "chat window, the three following actions may happen in order for you to "
@@ -6966,14 +10455,16 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ "Όταν έχει ληφθεί ένα νέο μήνυμα που δεν προέρχεται από μια επαφή που "
 #~ "βρίσκεται ήδη σε ένα παράθυρο κουβέντας, οι τρεις ακόλουθες ενέργειες "
 #~ "μπορεί να συμβούν για να ενημερωθείτε για αυτό"
+
 #~ msgid "_Earliest"
 #~ msgstr "_Αρχή"
+
 #~ msgid "_Latest"
 #~ msgstr "_Τέλος"
-#~ msgid "_Previous"
-#~ msgstr "_Πίσω"
+
 #~ msgid "%s is now %s: %s"
 #~ msgstr "Ο %s είναι τώρα %s: %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -6997,10 +10488,7 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ "Ο λογαριασμός προστέθηκε με επιτυχία.\n"
 #~ "Μπορείτε να δείτε όλες τις ρυθμίσεις του λογαριασμού σας κάνοντας "
 #~ "\"Επεξεργασία->Λογαριασμοί\" από το κεντρικό παράθυρο"
-#~ msgid "Error:"
-#~ msgstr "Σφάλμα:"
-#~ msgid "Node"
-#~ msgstr "Κόμβος"
+
 #~ msgid ""
 #~ "Your new account has been created and added to your gajim configuration.\n"
 #~ "You can set advanced account options using \"Edit->Accounts\" in the main "
@@ -7010,56 +10498,71 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #~ "του gajim.\n"
 #~ "Μπορείτε να ορίσετε προχωρημένες επιλογές από το \"Επεξεργασία-"
 #~ ">Λογαριασμοί\" στο μενού στο κύριου παραθύρου."
+
 #~ msgid "You need to enter a valid server address to add an account."
 #~ msgstr ""
 #~ "Πρέπει να δώσετε μία έγκυρη διεύθυνση διακομιστή για προσθήκη νέου "
 #~ "λογαριασμού."
+
 #~ msgid "Contact names must be of the form \"user@servername\"."
 #~ msgstr ""
 #~ "Τα ονόματα των επαφών πρέπει να είναι στην μορφή "
 #~ "\"όνομα_χρήστη@όνομα_διακομιστή\"."
+
 #~ msgid "Invalid contact ID"
 #~ msgstr "Μη έγκυρη ταυτότητα επαφής"
+
 #~ msgid "Contact ID must be of the form \"username@servername\"."
 #~ msgstr ""
 #~ "Η ταυτότητα επαφής πρέπει να είναι στην μορφή "
 #~ "\"όνομα_χρήστη@όνομα_διακομιστή\"."
+
 #~ msgid "Account registration successful"
 #~ msgstr "Επιτυχής καταχώρηση λογαριασμού"
+
 #~ msgid "The account \"%s\" has been registered with the Jabber server."
 #~ msgstr "Ο λογαριασμός \"%s\" καταχωρήθηκε στον Jabber διακομιστή"
+
 #~ msgid "theme_name"
 #~ msgstr "όνομα_θέματος"
+
 #~ msgid "Edit"
 #~ msgstr "Επεξεργασία"
 
-#, fuzzy
-#~ msgid "<b>Please fill in the data for your existing account</b>"
-#~ msgstr "Παρακαλώ συμπληρώστε τα δεδομένα για τον υπάρχων λογαριασμό σας"
 #~ msgid "Check if you want to register for a new jabber account"
 #~ msgstr "Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
+
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Πατήστε για να έχετε περισσότερες πληροφορίες για αυτή την επαφή"
+
 #~ msgid "_Compact View"
 #~ msgstr "_Συμπαγής Όψη"
+
 #~ msgid "_Refresh"
 #~ msgstr "_Ανανέωση"
+
 #~ msgid "_Register new account"
 #~ msgstr "_Καταχώρηση νέου λογαριασμού"
+
 #~ msgid "You just received a new message in room \"%s\""
 #~ msgstr "Μόλις λάβατε ένα νέο μήνυμα στο δωμάτιο \"%s\""
+
 #~ msgid ""
 #~ "If you close this window and you have history disabled, this message will "
 #~ "be lost."
 #~ msgstr ""
 #~ "Εάν κλείσετε αυτό το παράθυρο και έχετε απενεργοποιημένο το ιστορικό, "
 #~ "αυτό το μήνυμα θα χαθεί."
+
 #~ msgid "New _Room"
 #~ 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 "
@@ -7075,28 +10578,29 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #, fuzzy
 #~ msgid "Inactivate account"
 #~ msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
 
 #, fuzzy
 #~ msgid "Po_sition:"
 #~ msgstr "Θέση:"
+
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Εμφάνιση του κεντρικού παραθύρου κατά την εκκίνηση του Gajim"
+
 #~ msgid "_Service Discovery"
 #~ msgstr "Ανακάλυψη _Υπηρεσιών"
+
 #~ msgid "_Service Discovery..."
 #~ msgstr "Ανακάλυψη _Υπηρεσιών..."
+
 #~ msgid "error appeared while processing xmpp:"
 #~ msgstr "σφάλμα κατά την επεξεργασία xmpp:"
+
 #~ 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"
 #~ msgstr ""
 #~ "Σταματάει την επιλεγμένη μεταφορά αρχείου. Αν το αρχείο είναι ημιτελές, "
 #~ "τότε αφαιρείται. Αυτή η ενέργεια είναι μη αναστρέψιμη"
+
 #~ msgid "Chan_ge"
 #~ msgstr "Α_λλαγή"
-#~ msgid "Unknown type %s "
-#~ msgstr "Άγνωστος τύπος %s "
-
diff --git a/po/en_GB.po b/po/en_GB.po
index 55c81c8f9..f5b467bdc 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.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 11:26+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-17 00:58+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
 msgstr "Join _Group Chat..."
 
@@ -288,9 +288,9 @@ msgstr "Edit Personal Information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1030
-#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -299,11 +299,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2690
-#: ../src/roster_window.py:5170
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "General"
 
@@ -368,20 +368,20 @@ msgstr "Information about you, as stored in the server"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2045
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1953 ../src/config.py:2031 ../src/config.py:2044
-#: ../src/config.py:3147 ../src/config.py:3215 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2758
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2769
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "None"
 
@@ -545,7 +545,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -560,7 +560,7 @@ msgid "Mer_ge accounts"
 msgstr "Mer_ge accounts"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5122
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Re_name"
 
@@ -777,7 +777,7 @@ msgid "All statuses"
 msgstr "All statuses"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:277
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Away"
 
@@ -794,7 +794,7 @@ msgid "Have "
 msgstr "Have "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -803,7 +803,7 @@ msgid "Launch a command"
 msgstr "Launch a command"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Not Available"
 
@@ -980,7 +980,7 @@ msgid "Join _Group Chat"
 msgstr "Join _Group Chat"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "_Add to Roster..."
 
@@ -1032,10 +1032,10 @@ msgstr "_Add to Roster"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5797
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_History"
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Show a pop-up notification when a file transfer is complete "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continue"
 
@@ -1151,7 +1151,7 @@ msgstr "_Continue"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Open Containing Folder"
 
@@ -1199,7 +1199,7 @@ msgstr "Gajim Themes Customisation"
 msgid "Gone"
 msgstr "Gone"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inactive"
 
@@ -1307,7 +1307,7 @@ msgstr "_Voice"
 msgid "Create new post"
 msgstr "Create new post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "From"
 
@@ -1361,7 +1361,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Search Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Conversation History"
 
@@ -1384,7 +1384,7 @@ msgstr "Search:"
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1696
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
@@ -1411,8 +1411,8 @@ msgstr "Recently:"
 msgid "Room:"
 msgstr "Room:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182
-#: ../src/disco.py:1603
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Join"
 
@@ -1513,7 +1513,8 @@ 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 (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Change the room's subject (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1543,7 +1544,7 @@ msgstr "Show the contact's profile (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Send"
 
@@ -1707,10 +1708,6 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Display status _messages of contacts in roster"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Emoticons:"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1720,7 +1717,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:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1730,7 +1727,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:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1738,11 +1735,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:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Hide all buttons in chat windows"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1750,7 +1747,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1758,13 +1755,13 @@ msgstr ""
 "If ticked, Gajim will also include information about the sender of the new e-"
 "mails"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:53
 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:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1772,7 +1769,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:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1780,7 +1777,7 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1788,25 +1785,25 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
 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:59
+#: ../data/glade/preferences_window.glade.h:58
 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:60
+#: ../data/glade/preferences_window.glade.h:59
 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:61
+#: ../data/glade/preferences_window.glade.h:60
 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 "
@@ -1816,7 +1813,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:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1826,7 +1823,7 @@ msgstr ""
 "with caution, because it blocks all messages from any contact that is not in "
 "the roster"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:62
 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 "
@@ -1836,7 +1833,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:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1844,15 +1841,7 @@ msgstr ""
 "If ticked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"If ticked, Gajim will sort contacts in roster window and groupchats by their "
-"status and not by the shown name"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1862,7 +1851,7 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1870,7 +1859,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:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1878,47 +1867,43 @@ msgstr ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignore rich content in incoming messages"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Log _encrypted chat session"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "Ma_ke message windows compact"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Notify on new _GMail email"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Personal Events"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Play _sounds"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1928,19 +1913,19 @@ msgstr ""
 "Notify me about it\n"
 "Show only in roster"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Sign _in"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "Sign _out"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1948,23 +1933,28 @@ 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:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sort contacts by status"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "Status _iconset:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "T_heme:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -1972,7 +1962,7 @@ msgstr ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -1980,42 +1970,52 @@ msgstr ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Use _transports icons"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Use system _default"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "When new event is received:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "_Away after:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "_Display chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticons:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelt words"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore events from contacts not in the roster"
 
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignore rich content in incoming messages"
+
 #: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "_Incoming message:"
@@ -2049,22 +2049,28 @@ msgid "_Send chat state notifications:"
 msgstr "_Send chat state notifications:"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Sort contacts by status"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "_Status message:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "_URL highlight:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "_Window behaviour:"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Join _Group Chat"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Not in roster"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutes"
 
@@ -2112,7 +2118,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Privacy List"
 
@@ -2256,7 +2262,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefix:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Role:</b>"
 
@@ -2316,10 +2322,8 @@ msgstr "Remove account from Gajim and from _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5158 ../src/roster_window.py:5615
-#: ../src/roster_window.py:5744
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -2341,59 +2345,64 @@ msgstr "Edit _Groups..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5077 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5087 ../src/roster_window.py:5653
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Remove"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Send Single _Message..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Send _File..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Set Custom _Avatar..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Chat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Allow him/her to see my status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5149 ../src/roster_window.py:5605
-#: ../src/roster_window.py:5734
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Block"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Forbid him/her to see my status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
 msgid "_Ignore"
 msgstr "_Ignore"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "_Manage Contact"
@@ -2407,8 +2416,8 @@ msgid "_Subscription"
 msgstr "_Subscription"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5599
-#: ../src/roster_window.py:5731
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Unblock"
 
@@ -2417,45 +2426,46 @@ msgid "_Unignore"
 msgstr "_Unignore"
 
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "A_ccounts"
-
-#: ../data/glade/roster_window.glade.h:2
 msgid "Add _Contact..."
 msgstr "Add _Contact..."
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
 msgstr "Fea_tures"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "File _Transfers"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Frequently Asked Questions (online)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Help online"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profile, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Show Trans_ports"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Show _Offline Contacts"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _roster"
 msgstr "Show _roster"
 
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "Accounts"
+
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
 #: ../data/glade/subscription_request_window.glade.h:6
@@ -2466,7 +2476,7 @@ msgstr "_Actions"
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Edit"
 
@@ -2507,11 +2517,11 @@ msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5756
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
 msgid "_Search"
 msgstr "_Search"
 
@@ -2731,13 +2741,13 @@ msgstr "Assign Open_PGP Key"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Edit _Groups"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5714
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Rename"
 
@@ -2789,49 +2799,48 @@ msgid "Service returned an error."
 msgstr "Service returned an error."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(None)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -2840,203 +2849,226 @@ msgstr "Hidden"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1142 ../src/chat_control.py:1534
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1164 ../src/chat_control.py:2014
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843
-#: ../src/dialogs.py:896 ../src/gajim.py:1622 ../src/roster_window.py:926
-#: ../src/roster_window.py:1527 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1869 ../src/roster_window.py:5262
-#: ../src/roster_window.py:5439
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1293 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: ../src/chat_control.py:1295 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../src/chat_control.py:1297 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: ../src/chat_control.py:1301
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
-msgid "<b>\"%(title)s\"</b> by "
-msgstr "<b>\"%(title)s\"</b> by "
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1308
-#, python-format
-msgid "%(title)s by %(artist)s\n"
-msgstr "%(title)s by %(artist)s\n"
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
 #: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:1542 ../src/chat_control.py:1796
-msgid "Session WILL NOT be logged"
-msgstr "Session WILL NOT be logged"
-
-#: ../src/chat_control.py:1544 ../src/chat_control.py:1794
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Session WILL NOT be logged"
+
 #. encryption %s active
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1568
+#: ../src/chat_control.py:1580
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1584
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
-#: ../src/chat_control.py:1575
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3045,26 +3077,26 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:1621
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Command not supported for zeroconf account."
 
-#: ../src/chat_control.py:1632 ../src/groupchat_control.py:1524
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Commands: %s"
 
-#: ../src/chat_control.py:1635 ../src/groupchat_control.py:1538
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage: /%s, clears the text window."
 
-#: ../src/chat_control.py:1638 ../src/groupchat_control.py:1543
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/chat_control.py:1641 ../src/groupchat_control.py:1559
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3073,30 +3105,41 @@ msgstr ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 "third person. (e.g. /%(command)s explodes.)"
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Usage: /%s, sends a ping to the contact"
 
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, send the message to the contact"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1582
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "No help info for /%s"
 
-#: ../src/chat_control.py:1783
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:1790
-msgid "E2E encryption enabled"
-msgstr "E2E encryption enabled"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[This message is encrypted]"
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Session WILL be logged"
+
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Session WILL NOT be logged"
+
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3104,22 +3147,27 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:1803
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:1832 ../src/chat_control.py:1839
-#: ../src/chat_control.py:1845
-msgid "The following message was "
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "The following message was "
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
 msgstr "The following message was "
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2193
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3127,20 +3175,24 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2345 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Database Error"
 
-#: ../src/chat_control.py:2346 ../src/gajim.py:171
-#, python-format
+#: ../src/chat_control.py:2377
+#, fuzzy, python-format
 msgid ""
-"The database file (%s) cannot be read. Try to repare it or remove it (all "
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2578
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
@@ -3210,40 +3262,40 @@ msgstr "Presence description:"
 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:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
 #, 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:195
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
 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:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:794 ../src/roster_window.py:1531
-#: ../src/roster_window.py:1533 ../src/roster_window.py:5047
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "You left the following groupchats:"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr "Forward unread messages"
 
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
@@ -3283,20 +3335,20 @@ msgstr ""
 
 #. sorted alphanum
 #: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3087
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "default"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Enable link-local/zeroconf messaging"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3306,7 +3358,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 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. "
@@ -3316,17 +3368,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3336,7 +3388,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3344,7 +3396,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3352,7 +3404,7 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3362,18 +3414,14 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "The username used to identify the Last.fm account."
-
 #: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
@@ -3695,7 +3743,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr "List of colours that will be used to colour nicknames in group chats."
 
 #: ../src/common/config.py:254
@@ -3915,7 +3966,7 @@ msgstr "'yes', 'no', or 'both'"
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Sleeping"
 
@@ -3927,7 +3978,7 @@ msgstr "Back soon"
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Eating"
 
@@ -3943,7 +3994,7 @@ msgstr "Movie"
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Working"
 
@@ -3975,7 +4026,7 @@ msgstr "I'm available."
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:427 ../src/config.py:1391
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Be right back."
 
@@ -4003,11 +4054,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "grocery"
 
@@ -4019,7 +4070,7 @@ msgstr "human"
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:71
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
@@ -4033,112 +4084,114 @@ msgstr "Wrong host"
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:635
+#: ../src/common/connection_handlers.py:639
 #, 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:918
-#: ../src/common/connection_handlers.py:1813
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2162 ../src/common/connection.py:1203
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:840
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:1122 ../src/common/connection.py:841
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1929
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2000
-#: ../src/common/connection_handlers.py:2003
-#: ../src/common/connection_handlers.py:2006
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2013
-#: ../src/common/connection_handlers.py:2022
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2001
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from group chat %s."
 
-#: ../src/common/connection_handlers.py:2004
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2063
 #, 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:2014
+#: ../src/common/connection_handlers.py:2067
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
-#: ../src/common/connection_handlers.py:2023
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Room has been destroyed"
 
-#: ../src/common/connection_handlers.py:2061
+#: ../src/common/connection_handlers.py:2116
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: ../src/common/connection_handlers.py:2088
+#: ../src/common/connection_handlers.py:2143
 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:2109
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2111
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2113
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2275
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4148,203 +4201,213 @@ msgstr ""
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2300
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passphrase was not given"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, 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:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, 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:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:703
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1040
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:660
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Connection with account \"%s\" has been lost"
+
+#: ../src/common/connection.py:666
 #, 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:663
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4353,7 +4416,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4362,24 +4425,24 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:704
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:729
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:793
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4388,12 +4451,12 @@ 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:1084
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 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:1086
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4401,11 +4464,11 @@ 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:1095
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:1193
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4415,32 +4478,32 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1365
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Observers"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117
-#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1523
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1668
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 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:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
@@ -4619,250 +4682,250 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Server address required."
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Available"
 
-#: ../src/common/helpers.py:270 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Available"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:323
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:388
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:392
+#: ../src/common/helpers.py:405
 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:395
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: ../src/common/helpers.py:979 ../src/common/helpers.py:986
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, 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:992
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:997
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " from %s"
 
-#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, 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:1044
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -4875,520 +4938,669 @@ msgstr "Gajim account %s"
 msgid "Afraid"
 msgstr "Afraid"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Amazed"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Aroused"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Angry"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Annoyed"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Anxious"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Aroused"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Bored"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Brave"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Calm"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Curious"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Cold"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Contents"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Confused"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Contented"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Contented"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Cranky"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Cranky"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deactivated"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Curious"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Delete"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Depressed"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Disappointed"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Disgusted"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Disabled"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Distracted"
 
-#: ../src/common/pep.py:38
-msgid "Embarassed"
+#: ../src/common/pep.py:56
+#, fuzzy
+msgid "Embarrassed"
 msgstr "Embarrassed"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Excited"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Flirtatious"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Frustrated"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Driving"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Grumpy"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Guilty"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Happy"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Hot"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Humbled"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Humiliated"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Hungry"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Hurt"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Impressed"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "In Awe"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "In Love"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Indignant"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Interested"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Intoxicated"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Jealous"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Lonely"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Mean"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Moody"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nervous"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Offended"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustrated"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Playful"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Proud"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Relieved"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Relieved"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Remorseful"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Restless"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Sad"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Sarcastic"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Last modified:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Serious"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Shocked"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Shy"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Sick"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Stressed"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Surprised"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Thirsty"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Thoughtful"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Time"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "nine"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Worried"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Doing Chores"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Buying Groceries"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Cleaning"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Cooking"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Doing Maintenance"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Doing the Dishes"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Doing the Laundry"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Gardening"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Running an Errand"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Walking the Dog"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Drinking"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Having a Beer"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Having Coffee"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Having Tea"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Having a Snack"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Having Breakfast"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Having Dinner"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Having Lunch"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Exercising"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Cycling"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Cleaning"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Hiking"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Playing Sports"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Running"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Skiing"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Swimming"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Working out"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Grooming"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "At the Spa"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Brushing Teeth"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Getting a Haircut"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Shaving"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Taking a Bath"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Taking a Shower"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Having an Appointment"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Day Off"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Hanging out"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Hiking"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Partying"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Scheduled Holiday"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Drinking"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Relaxing"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Hiking"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Gaming"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Going out"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Partying"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Reading"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Shopping"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Skiing"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Socialising"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Sunbathing"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Watching TV"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Watching a Movie"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Talking"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "In Real Life"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "On Video Phone"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Travelling"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Commuting"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Driving"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "In a Car"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "On a Bus"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "On a Plane"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "On a Train"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "On a Trip"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Walking"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Coding"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "In a Meeting"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Studying"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Writing"
 
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Unable to bind to port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+
 #. we're not english
-#: ../src/common/stanza_session.py:282
+#: ../src/common/stanza_session.py:278
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5481,40 +5693,40 @@ msgstr "Contact is offline. Your message could not be sent."
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:319
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:327
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Default Message"
 
-#: ../src/config.py:410
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:452
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Always use OS/X default applications"
 
-#: ../src/config.py:453
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Custom"
 
-#: ../src/config.py:643 ../src/dialogs.py:1198
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:644
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5523,104 +5735,104 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "status message text"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
 #. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1822 ../src/dialogs.py:1886
-#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793
-#: ../src/history_window.py:86
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1401
+#: ../src/config.py:1406
 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:1525 ../src/config.py:1624
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1660 ../src/config.py:1701
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1687
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1694
 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:1697
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1698
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1702
+#: ../src/config.py:1710
 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:1708
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1709
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5628,144 +5840,144 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1713 ../src/config.py:1717
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1718
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1789
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:1808 ../src/config.py:1816 ../src/config.py:1858
-#: ../src/config.py:3085 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1828
 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:2006 ../src/config.py:3157
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2007 ../src/config.py:3158
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2028
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2029
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:2064
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2076
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2089
 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:2084 ../src/dialogs.py:1674 ../src/dialogs.py:1810
-#: ../src/dialogs.py:1990 ../src/disco.py:438 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2085
+#: ../src/config.py:2097
 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:2089
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2121
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2122
+#: ../src/config.py:2134
 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:2305
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2343
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2345
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2395 ../src/disco.py:762 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2412
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2437
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2439
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5773,11 +5985,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2441
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2442
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5785,11 +5997,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2444
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2445
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5797,11 +6009,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2448
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5809,7 +6021,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5825,84 +6037,84 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2552
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2574 ../src/gajim.py:1411 ../src/roster_window.py:1932
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2575 ../src/roster_window.py:1906
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2576 ../src/roster_window.py:1933
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2586
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2682
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2682
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2683
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2684
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2787
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
-#: ../src/config.py:3068
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3070
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3096
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Duplicate Jabber ID"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "This account is already configured in Gajim."
 
-#: ../src/config.py:3114
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3115 ../src/config.py:3302
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5912,24 +6124,24 @@ msgstr ""
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3133
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:3134
+#: ../src/config.py:3138
 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:3185 ../src/gajim.py:1983
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3186 ../src/gajim.py:1984
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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:3254
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -5944,7 +6156,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3260 ../src/gajim.py:2007
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -5955,23 +6167,23 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3281 ../src/config.py:3320
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3301
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3404
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3405
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/conversation_textview.py:547
+#: ../src/conversation_textview.py:549
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -5981,7 +6193,7 @@ msgstr ""
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 
-#: ../src/conversation_textview.py:566
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -5989,51 +6201,56 @@ 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:676
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:688
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:712
 #, 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:723
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:732
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "error while sending %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
@@ -6066,156 +6283,143 @@ msgstr "Contact name: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:731
 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:871 ../src/dialogs.py:877 ../src/dialogs.py:882
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:898
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:934
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:994
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1035
 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:1031
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1191
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/dialogs.py:1192
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-
-#: ../src/dialogs.py:1199
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6228,88 +6432,88 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1603
+#: ../src/dialogs.py:1614
 #, 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:1606
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1667 ../src/gajim.py:2589
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1675
+#: ../src/dialogs.py:1686
 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:1694
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:1765
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:1766 ../src/groupchat_control.py:1329
-#: ../src/groupchat_control.py:1601
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:1770 ../src/dialogs.py:1776
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1767
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:1783
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1795
 #, 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:1811
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1858
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1870
 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:1883
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:1941
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6318,311 +6522,325 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2025
 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:2054 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2056 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1576 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1642 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1541 ../src/gajim.py:1609
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1681 ../src/gajim.py:1703
-#: ../src/gajim.py:1720 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1684 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1432 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2070 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2388
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2628
 #, 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:2624
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:3827
-#, python-format
+#: ../src/dialogs.py:3836
+#, fuzzy, python-format
 msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
 "\n"
-"This session's Short Authentication String is %(sas)s."
+"This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 "Your chat session with %(jid)s is encrypted.\n"
 "\n"
 "This session's Short Authentication String is %(sas)s."
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+#, fuzzy
 msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+"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 ""
 "To be certain that only the expected person can read your messages or send "
 "you messages, you need to verify their identity."
 
-#: ../src/dialogs.py:3842
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:3854
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3869
+#, fuzzy
+msgid "Verify..."
+msgstr "_Verify"
+
+#: ../src/dialogs.py:3881
+#, fuzzy
+msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the remote contact's identity?"
 
-#: ../src/dialogs.py:3855
-#, python-format
+#: ../src/dialogs.py:3882
+#, fuzzy, python-format
 msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"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>."
@@ -6633,37 +6851,58 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:3883
 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/disco.py:115
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "The contact's key (%s) does not match the key assigned in Gajim."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:119
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:439
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:515
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:655
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -6671,72 +6910,77 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:660 ../src/disco.py:942
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:661
+#: ../src/disco.py:662
 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:741
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Invalid server"
+
+#: ../src/disco.py:754
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:781
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:943
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1164
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1174 ../src/disco.py:1338
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1375
+#: ../src/disco.py:1390
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1557
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1565
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1802
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1867
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1873
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1879
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -6775,7 +7019,8 @@ msgid "gajim-remote"
 msgstr "gajim-remote"
 
 #: ../src/features_window.py:60
-msgid "A script to controle Gajim via commandline."
+#, fuzzy
+msgid "A script to control Gajim via commandline."
 msgstr "A script to control Gajim via commandline."
 
 #: ../src/features_window.py:61
@@ -6785,7 +7030,7 @@ msgstr "Requires python-dbus."
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Feature not available under Windows."
 
@@ -6924,9 +7169,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transform LaTeX expressions between $$ $$."
 
 #: ../src/features_window.py:101
+#, fuzzy
 msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
 "Requires texlive-latex-base, dvips and imagemagick. You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Requires texlive-latex-base, dvips and imagemagick. You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -6987,106 +7242,106 @@ msgstr "Time"
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "File transfer stopped by the contact at the other end"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Description: "
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7094,33 +7349,33 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Save File as..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7128,32 +7383,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
@@ -7231,68 +7486,79 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, 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)."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gajim.py:560
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gajim.py:562
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gajim.py:919 ../src/gajim.py:923
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:933 ../src/gajim.py:946
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:978
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:998
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7300,72 +7566,72 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: ../src/gajim.py:1039
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
-#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216
-#: ../src/history_window.py:408 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: ../src/gajim.py:1296
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s has set the subject to %s"
+msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1359 ../src/groupchat_control.py:1026
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Room now shows unavailable member"
 
-#: ../src/gajim.py:1364
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "A non-privacy-related room configuration change has occurred"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: ../src/gajim.py:1372
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: ../src/gajim.py:1374
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: ../src/gajim.py:1412
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
-#: ../src/gajim.py:1446
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7373,27 +7639,27 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1554
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "You have %d new mail conversation"
 msgstr[1] "You have %d new mail conversations"
 
-#: ../src/gajim.py:1568
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7408,34 +7674,34 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1704
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1708
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1721
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7444,36 +7710,36 @@ msgstr ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gajim.py:1888
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:1889
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gajim.py:1950
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7481,11 +7747,11 @@ msgstr ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 
-#: ../src/gajim.py:2004
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7496,15 +7762,15 @@ msgstr ""
 "(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gajim.py:2010
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gajim.py:2025
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7521,11 +7787,11 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../src/gajim.py:2048 ../src/gajim.py:2078
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7533,16 +7799,16 @@ msgstr ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 
-#: ../src/gajim.py:2051 ../src/gajim.py:2081
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: ../src/gajim.py:2052 ../src/gajim.py:2082 ../src/groupchat_control.py:1707
-#: ../src/roster_window.py:3806
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "Do _not ask me again"
 
-#: ../src/gajim.py:2079
+#: ../src/gajim.py:2089
 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?"
@@ -7550,21 +7816,21 @@ msgstr ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2547 ../src/gajim.py:2568
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gajim.py:2548
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7572,7 +7838,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../src/gajim.py:2569
+#: ../src/gajim.py:2594
 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 "
@@ -7582,63 +7848,55 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gajim.py:2595 ../src/roster_window.py:3334
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2876
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gajim.py:2973
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/gajim.py:2974
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/gajim.py:2987
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/gajim.py:2988
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "You can manage your bookmarks via Actions menu in your roster."
 
-#: ../src/gajim.py:3175
-msgid "Network Manager support not available"
-msgstr "Network Manager support not available"
-
-#: ../src/gajim.py:3299
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management support not available (missing gnome.ui module)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7646,47 +7904,47 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7694,19 +7952,19 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7716,29 +7974,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7748,134 +8006,134 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -7883,67 +8141,67 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr "URI to handle"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Account in which you want to handle it"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "Room JID"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Nickname to use"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Password to enter the room"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Account from which you want to enter the room"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: ../src/gajim-remote.py:314
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:333
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7952,15 +8210,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:389
+#: ../src/gajim-remote.py:380
 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:418
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7969,16 +8227,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7987,7 +8245,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -7996,7 +8254,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:508
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8005,7 +8263,7 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:527
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8034,127 +8292,147 @@ 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:145
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
 #, 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:383
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:535
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:537
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "If you send a file to %s, he/she will know your real Jabber ID."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1132
 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:1040
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1142
 #, 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:1051
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1153
 #, 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:1064
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1102
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1107
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s has been kicked: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1214
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname not found: %s"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "This group chat has no subject"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8167,7 +8445,7 @@ msgstr ""
 "the JID is currently in the group chat, he/she/it will also be kicked. Does "
 "NOT support spaces in nickname."
 
-#: ../src/groupchat_control.py:1534
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8176,7 +8454,7 @@ msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8185,7 +8463,7 @@ msgstr ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 
-#: ../src/groupchat_control.py:1546
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8194,7 +8472,7 @@ msgstr ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 
-#: ../src/groupchat_control.py:1550
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8203,7 +8481,7 @@ msgstr ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 
-#: ../src/groupchat_control.py:1554
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8214,7 +8492,7 @@ msgstr ""
 "from the group chat and optionally displays a reason. Does NOT support "
 "spaces in nickname."
 
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8223,62 +8501,62 @@ msgstr ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 
-#: ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: ../src/groupchat_control.py:1572
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: ../src/groupchat_control.py:1576
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
 
-#: ../src/groupchat_control.py:1579
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1837
 #, 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:1703
+#: ../src/groupchat_control.py:1839
 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:1740
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1882
 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:1773
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8286,22 +8564,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1950
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2247
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8384,7 +8662,7 @@ msgstr "Contacts"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Date"
 
@@ -8395,7 +8673,7 @@ msgstr "Nickname"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Message"
 
@@ -8446,22 +8724,27 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: ../src/history_window.py:404
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Disk WriteError"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:414
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:417
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
@@ -8474,19 +8757,19 @@ msgstr "Timeout loading image"
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: ../src/message_window.py:440
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:442
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Messages"
 
@@ -8498,42 +8781,42 @@ msgstr "- messages will be logged"
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaged by %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
@@ -8546,18 +8829,18 @@ msgstr "Generic"
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2803
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2806
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2808 ../src/roster_window.py:2819
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Could not load image"
 
@@ -8589,38 +8872,38 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:955
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1882
 #, 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:1883
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8628,15 +8911,15 @@ msgstr ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
 
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:2095 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2096 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8644,15 +8927,15 @@ 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:2122
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2493
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8660,16 +8943,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:2494
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2498
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8677,11 +8960,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2501
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8691,51 +8974,52 @@ msgstr ""
 "these transports: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2734
 #, 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:2744
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove also all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2790
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3146
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8743,7 +9027,13 @@ msgstr ""
 "By removing this contact you also remove authorisation resulting in him or "
 "her always seeing you as offline."
 
-#: ../src/roster_window.py:3151
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Do you want to accept the invitation?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8751,16 +9041,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:3154
+#: ../src/roster_window.py:3144
 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:3158
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8769,19 +9059,19 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3192
 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:3720
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -8789,13 +9079,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:3800
+#: ../src/roster_window.py:3784
 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:3802
+#: ../src/roster_window.py:3786
 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 "
@@ -8805,14 +9095,14 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:3915
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:3926
-#, python-format
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files 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:"
 
@@ -8821,123 +9111,123 @@ msgstr[1] "Do you want to send these files to %s:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4598 ../src/roster_window.py:4669
-#: ../src/roster_window.py:4678 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4690
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4730
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4749
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:4851 ../src/roster_window.py:4960
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:4878
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:4885
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Mood"
 
-#: ../src/roster_window.py:4889
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Activity"
 
-#: ../src/roster_window.py:4894
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5048
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
 #. Send Group Message
-#: ../src/roster_window.py:5056 ../src/roster_window.py:5560
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5068
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "To all online users"
 
-#: ../src/roster_window.py:5462
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5580
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
 #. Send single message
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5697
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
-#: ../src/roster_window.py:5780
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
-#: ../src/roster_window.py:5867
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
 #. History manager
-#: ../src/roster_window.py:5980
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5989
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6199
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -8954,27 +9244,27 @@ msgstr "Error in received dataform"
 msgid "No result"
 msgstr "No result"
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:392 ../src/session.py:430
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:393
-#, python-format
+#: ../src/session.py:400
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t\t%s\n"
+"\t%s\n"
 "\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
 msgstr ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
@@ -8982,7 +9272,7 @@ msgstr ""
 "\n"
 "\t\tAre these options acceptable?"
 
-#: ../src/session.py:431
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -8997,19 +9287,19 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/systray.py:261
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Resource: "
 
@@ -9026,104 +9316,95 @@ msgstr " [blocked]"
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Mood:"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Activity:"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Tune:"
 
-#: ../src/tooltips.py:641
-#, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9131,24 +9412,24 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9156,7 +9437,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9164,13 +9445,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 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:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9178,18 +9459,73 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 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:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Toggle Open_PGP Encryption"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "No such command: /%s (if you want to send this, prefix it with /say)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E encryption enabled"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E encryption disabled"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "If ticked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+
+#~ msgid "A_ccounts"
+#~ msgstr "A_ccounts"
+
+#~ msgid "<b>\"%(title)s\"</b> by "
+#~ msgstr "<b>\"%(title)s\"</b> by "
+
+#~ msgid "%(title)s by %(artist)s\n"
+#~ msgstr "%(title)s by %(artist)s\n"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "The username used to identify the Last.fm account."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Thoughtful"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Manager support not available"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Session Management support not available (missing gnome.ui module)"
+
 #~ msgid "_Retype Password:"
 #~ msgstr "_Retype Password:"
 
@@ -9461,9 +9797,6 @@ msgstr " resource with priority "
 #~ "\n"
 #~ "Highlighting misspelt words feature will not be used"
 
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
-
 #~ msgid "Every %s _minutes"
 #~ msgstr "Every %s _minutes"
 
@@ -9502,10 +9835,6 @@ msgstr " resource with priority "
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s does not appear to be a valid JID"
 
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "No such command: /%s (if you want to send this, prefix it with /say)"
-
 #~ msgid "%s - Gajim"
 #~ msgstr "%s - Gajim"
 
diff --git a/po/eo.po b/po/eo.po
index 1343b80cd..5bf1bbd93 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,24 +2,20 @@
 # Copyright (C) 2006 THE gajim'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gajim package.
 # Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>, 2006.
-# 
-# 
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:236 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:243 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-28 23:20+0400\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-29 00:11+0400\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -34,44 +30,53 @@ msgid "Jabber IM Client"
 msgstr "Jabber-tujmesaĝilo"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Sendi unuopan _mesaĝon..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Serĉi servojn..."
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Discover Services"
+msgstr "_Serĉi servojn"
 
-#: ../data/glade/account_context_menu.glade.h:4 ../src/disco.py:1145
+#: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Plenumi komandon..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Babilejo"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Korekti konton"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Korekti konton..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -84,54 +89,80 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klaku por vidi trajtojn (kiel MSN, ICQ transportiloj) de jabber-serviloj"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Konekti kiam vi premos Finigi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontkreilo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Mi volas registri novan konton"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:7
-msgid "Pass_word:"
-msgstr "Pas_vorto:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Administri..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Prokura servilo:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Konservi pasvorton"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Servilaj trajtoj"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Korekti vian personan informon kiam vi konektitos"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Uzi propran servilnomon/pordon"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -139,67 +170,64 @@ msgstr ""
 "Vi bezonas havi konton por ke konekti\n"
 "al la jaber-reto."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Via JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Krome"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Finigi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Retnodo:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Servilnomo: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Ripetu pasvorton:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servilo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Uzi prokuran servilon"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:31
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Salutnomo:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Cetero</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persona informo</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Konto"
 
@@ -208,19 +236,28 @@ msgid "Account Modification"
 msgstr "Konta korektado"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Estra listo"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Auto-reconnect when connection is lost"
 msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_onekti dum lanĉo de Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Ŝanĝi _pasvorton"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -231,43 +268,61 @@ msgstr ""
 "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:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Elekti _ŝlosilon..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klaku por ŝanĝi konta pasvorton"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Konekto"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Korekti personan informon..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:458
-#: ../src/notify.py:480 ../src/notify.py:492 ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346 ../src/roster_window.py:1224
-#: ../src/roster_window.py:1435 ../src/roster_window.py:2111
-#: ../src/roster_window.py:2153 ../src/common/contacts.py:284
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Ĝenerala"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Servilnomo: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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."
@@ -275,7 +330,8 @@ msgstr ""
 "Se markitas, Gajim anoncos krom vian IP ankoraŭ kelkajn IP, do "
 "dosiertransmeto havos pli ŝancojn funkcii."
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../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"
@@ -283,7 +339,7 @@ msgstr ""
 "se markitas, Gajim sendados vivkontrolajn (keep-alive) pakaĵojn, tio "
 "preventas diskonekton pro longa neaktiva tempo"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -292,14 +348,16 @@ msgstr ""
 "Se markitas, Gajim konservos pasvorto en ~/.gajim/config kun legpermeso nur "
 "por vi."
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr "Se markitas, Gajim aŭtomate konektos per tiu konto dum lanĉo"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -309,44 +367,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:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Administri..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3405
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1667 ../src/config.py:1741
-#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Neniu"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persona informo"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Pordo: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priori_tato:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -356,19 +419,22 @@ 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:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 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:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Prokura servilo:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Risur_cnomo:"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -381,91 +447,158 @@ msgstr ""
 "\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
 "ricevos la eventojn."
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Konservi pas_frazon (malsekure)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Sendi vivkontrolajn pakaĵojn"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_ronigi kontan staton kun komuna stato"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Uzi propran servilnomon/pordon"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Uzi dosiertransmetan prokuran servilon"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Nomo:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Se markita, ĉiuj lokaj kontaktoj kiuj uzas Bonjour-kapablajn tujmesaĝilojn "
-"(kiel iChat, Trillian aŭ Gaim) estos montrata en kontaktlisto. Vi ne bezonas "
-"konekton al jabber-servilo por ke tio funkciu.\n"
-"Ĉi tio eblas nur se estas instalita python-avahi kaj avahi-demono estas "
-"lanĉita."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Retpoŝtadreso:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Ebligi"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 vi havas 2 aŭ plie kontojn kaj tio estas markita, Gajim montras ĉiujn "
-"kontaktojn, kvazaŭ vi havas unu konton"
+"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:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Familia nomo:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Unuigi kontojn"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "Ebligi _lig-lokan komunikadon"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Re_nomigi"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Korekti"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Forigi"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Uzi propran pordon:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -523,7 +656,45 @@ msgstr "Re_gistri"
 msgid "_User ID:"
 msgstr "_Uzula ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occurred:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Priskribo"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+msgid "Please wait while retrieving command list..."
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+msgid "Please wait while the command is sending..."
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:8
+msgid "Please wait..."
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.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
 msgid "<b>Description</b>"
 msgstr "<b>Priskribo</b>"
 
@@ -549,45 +720,45 @@ msgid "Deletes Message of the Day"
 msgstr "Forigas mesaĝon de la tago"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Privataj listoj"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 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:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Enigi tagmesaĝon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Instalas mesaĝon de la tago"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Montri _XML-konzolon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Renovigi tagmesaĝon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Renovigas mesaĝon de la tago"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administristo"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Privataj listoj"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Sendi servilan mesaĝon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Sendi unuopan mesaĝon"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " iun fenestron/slipon malfermitan kun tiu kontakto "
@@ -601,7 +772,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Kondiĉoj</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonoj</b>"
 
@@ -618,7 +789,7 @@ msgid "All statuses"
 msgstr "ia ajn stato"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:243
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Fora"
 
@@ -635,7 +806,7 @@ msgid "Have "
 msgstr "Havas "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -644,7 +815,7 @@ msgid "Launch a command"
 msgstr "Lanĉi komandon"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Nedisponebla"
 
@@ -749,6 +920,58 @@ msgstr "por "
 msgid "when I'm in"
 msgstr "dum mi estas je"
 
+#: ../data/glade/atom_entry_window.glade.h:1
+#, fuzzy
+msgid "Entry:"
+msgstr "Lando:"
+
+#: ../data/glade/atom_entry_window.glade.h:2
+#, fuzzy
+msgid "Feed name:"
+msgstr "Etosa nomo"
+
+#: ../data/glade/atom_entry_window.glade.h:3
+#, fuzzy
+msgid "Last modified:"
+msgstr "Familia nomo:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "New entry received"
+msgstr "Kiam ricevas novan eventon"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
+msgstr ""
+
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Kontaktoj"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Sonoj</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Ŝanĝi pasvorton"
@@ -778,10 +1001,9 @@ msgid "Join _Group Chat"
 msgstr "Eniri en babilejon"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Aldoni al kontaktlisto"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -801,39 +1023,70 @@ msgid "_Open Link in Browser"
 msgstr "_Malfermi ligilon per retrigardilo"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Ekparoli"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontaktoj"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Sendi _dosieron"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Baskuli Open_PGP-ĉifradon"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kompakta vido    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Aldoni al kontaktlisto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historio"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "In_viti al"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Rigardiloj"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Plenigu la formon."
@@ -846,6 +1099,24 @@ msgstr "Agordo de babilejo"
 msgid "Edit Groups"
 msgstr "Aranĝi grupojn"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Priskribo</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Servilaj trajtoj"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
@@ -900,7 +1171,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Daŭrigi"
 
@@ -908,7 +1179,7 @@ msgstr "_Daŭrigi"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Malfermi enhavantan dosierujon"
 
@@ -956,7 +1227,7 @@ msgstr "Etosa administrado de Gajim"
 msgid "Gone"
 msgstr "Foriris"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Neaktiva"
 
@@ -997,67 +1268,93 @@ msgid "_Background:"
 msgstr "_Fono:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Ŝanĝi kaŝ_nomon"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Ŝanĝi _temon"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klaku por vidi pasintan interparolon en tiu ĉi babilejo"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Administri _babilejon"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Administri _babilejon"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Starigi legosignon por tiu babilejo"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Starigi legosignon por tiu babilejo"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derigisto"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Agoj por babilanto"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Estro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Malpermesi"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Elpeli"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Agoj por babilanto"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Mastro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Sendi privatan mesaĝon"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Voĉo"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Nova mesaĝo"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+msgid "From"
+msgstr "De"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
+msgid "Subject"
+msgstr "Temo"
+
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1071,56 +1368,58 @@ msgstr ""
 "Ĝenerale evitu forigojn rilatajn al kontaktoj kun kiu vi interparolas "
 "nuntempe."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim administrilo de protokoloj"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Eksportado"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim administrilo de protokoloj"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Serĉi datumbaze"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Konstrui propran informmendon"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Historio de interparoloj"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Konstruilo de petoj..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Serĉi"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Serĉi"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Akcepti"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Rifuzi"
+#, fuzzy
+msgid "Search:"
+msgstr "Serĉi"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Invito estas ricevita"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Protokoli komunikadan historion"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1148
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
@@ -1129,14 +1428,12 @@ 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:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Pasvorto:"
 
@@ -1145,12 +1442,12 @@ msgid "Recently:"
 msgstr "Antaŭ nelonge:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1163
-#: ../src/disco.py:1546
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Aliĝi"
 
@@ -1170,18 +1467,37 @@ msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 msgid "Manage Bookmarks"
 msgstr "Aranĝi legosignojn"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Eligi statojn:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Servilo:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titolo:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Agordo de babilejo"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Agordo</b>"
@@ -1203,11 +1519,13 @@ msgid "Manage Proxy Profiles"
 msgstr "Administri prokurservilajn agordojn"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Name:"
 msgstr "Nomo:"
 
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Pas_vorto:"
+
 #: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Tipo:"
@@ -1216,25 +1534,59 @@ msgstr "Tipo:"
 msgid "Use authentication"
 msgstr "Uzi aŭtentokontrolon"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Retnodo:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klaku por enigi mienon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aligas kontakton en kontaktliston"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
-msgid "OpenPGP Encryption"
-msgstr "Ĉifrado per OpenPGP"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Agoj"
+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"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Sendi"
 
@@ -1250,36 +1602,77 @@ msgstr "<b>Detala agorda administrilo</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Programoj</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Agoj</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Propraj</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Redakti regulon</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Aranĝo de lineo</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Koloroj de babilstataj langetoj</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Agordo por GMail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Bildavizoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Agordo de fasado</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Sonoj</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Agordo por GMail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Privataj listoj</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Bildavizoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Krome"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Krome"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1289,50 +1682,25 @@ msgstr ""
 "nur pri tajpado\n"
 "neniam"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Ebligi sendi informon pri _OS"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 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:18
-msgid "Also known as iChat style"
-msgstr "Konata ankaŭ kiel stilo de iChat"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Ekzemplo: se vi havas ebligitan statmesaĝon por fora, Gajim ne demandos vin "
-"por statmesaĝo kiam vi ŝanĝas vian staton al fora; ĝi uzos defaŭlton kiu "
-"estas specifita ĉi tie"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Demandi statmesaĝon kiam mi:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Aŭtomate _fora post:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Aŭtomate nedisponebla post:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Aŭtodetekti dum ĉiu Gajim lanĉo\n"
@@ -1341,71 +1709,57 @@ msgstr ""
 "Ĉiam uzi defaŭlton de XFCE\n"
 "Propraj"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
-msgid "Chat"
-msgstr "Babilejo"
-
-#: ../data/glade/preferences_window.glade.h:30
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
-msgstr ""
-"Marku tiun opcion, nur se iu ne el via kontaktlisto spamas/ĉagrenas vin. Uzu "
-"singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
-"kontaktlisto"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid "Configure color and font of the interface"
-msgstr "Agordo de koloro kaj tiparo de la fasado"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Defaŭlta statmesaĝo"
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Statmesaĝo:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Defaŭlta stata p_iktogramaro:"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Agordo de koloro kaj tiparo de la fasado"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Determinatajn de sendanto\n"
-"Interparolajn mesaĝojn\n"
-"Unuopajn mesaĝojn"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Montri _kromajn detalojn pri retleteroj"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Montrataj babilstataj _avizoj:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "Ĉiujn 5 _minutojn"
+msgid "Display _extra email details"
+msgstr "Montri _kromajn detalojn pri retleteroj"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Mienoj:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Eventoj"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Display status _messages of contacts in roster"
+msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
+
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1415,7 +1769,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:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1425,41 +1779,25 @@ msgstr ""
 "Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
 "interparolanto."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr ""
-"Gajim aŭtomate montros novajn eventojn antaŭigante la adekvatan fenestron"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim avizos vin pri novaj eventoj per ŝprucfenestro en la malsupra dekstra "
-"angulo de la ekrano"
-
 #: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
-"ekrano pri kontaktoj kiu ĵus ensalutis"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus elsalutis"
 
 #: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Kaŝas la butonojn en babileja fenestro."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr ""
-"Gajim nur ŝanĝos la piktogramon de la kontakto, kiu okazigis novan eventon"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
@@ -1469,13 +1807,24 @@ msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
 #: ../data/glade/preferences_window.glade.h:53
 msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
+msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1483,246 +1832,296 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Se markitas, Gajim memoros la kontaktlistan kaj interparolajn fenestrajn "
-"lokojn sur la ekrano kaj iliajn dimensiojn je sekva lanĉo."
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Se markitas, Gajim uzos protokolo-specifajn statpiktogramojn. (ekzemple "
-"kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
-"fora, okupata ktp...)"
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
-"ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignori formatadon en venantaj mesaĝoj"
+#: ../data/glade/preferences_window.glade.h:60
+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:59
-msgid "Ma_nage..."
-msgstr "Admi_nistri..."
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Marku tiun opcion, nur se iu ne el via kontaktlisto spamas/ĉagrenas vin. Uzu "
+"singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
+"kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Neniam\n"
-"Ĉiam\n"
-"Perkonte\n"
-"Perspece"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Avizi min pri kontaktoj kiuj: "
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se markitas, Gajim uzos protokolo-specifajn statpiktogramojn. (ekzemple "
+"kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
+"fora, okupata ktp...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Avizi pri novaj _Gmail-leteroj"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "En ĉ_iu mesaĝo"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
+"ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "_Unu mesaĝfenestro:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Eliraj babilstataj _avizoj:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Unu mesaĝfenestro:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Ludi _sonojn"
+msgid "Ma_nage..."
+msgstr "Admi_nistri..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Agordo"
+#, fuzzy
+msgid "Notifications"
+msgstr "Konta korektado"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Eligi tempon:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr ""
-"Konservi _lokon kaj grandecon de kontaktlista kaj interparola fenestroj"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Starigi statmesaĝon por reflekti kurantan ludantan _muzikaĵon"
+msgid "Notify on new _GMail email"
+msgstr "Avizi pri novaj _Gmail-leteroj"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Montri nur en _kontaktlisto"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Persona detalaĵoj"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "E_nsalutas"
+msgid "Play _sounds"
+msgstr "Ludi _sonojn"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "E_lsalutas"
-
-#: ../data/glade/preferences_window.glade.h:77
 msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
 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:78
-msgid "Status"
-msgstr "Stato"
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "_Etoso:"
+msgid "Preferences"
+msgstr "Agordo"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "La aŭtomate fora statmesaĝo"
+msgid "Sign _in"
+msgstr "E_nsalutas"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "La aŭtomate nedisponebla statmesaĝo"
+msgid "Sign _out"
+msgstr "E_lsalutas"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Rigardi ĉiujn venantajn mesaĝojn kiel:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
+"markitas, Gajim simple montros krudan mesaĝan tekston."
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Uzi _transportilajn piktogramarojn"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Uzi sisteman defaŭlton"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Stato"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Uzi pletpiktogramon"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Defaŭlta stata p_iktogramaro:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Kiam nova evento (mesaĝo, peto pri dosiertransmeto ktp) estas ricevita, la "
-"sekvaj metodoj eblos uzata por informi vin pri ĝi. Bonvolu rimarki ke "
-"eventoj pri novaj mesaĝoj okazas nur se ĝi estas mesaĝo de kontakto kun kiu "
-"vi ankoraŭ ne parolas"
+#, fuzzy
+msgid "Style"
+msgstr "Malrapidas"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Kiam ricevas novan eventon"
+msgid "T_heme:"
+msgstr "_Etoso:"
 
 #: ../data/glade/preferences_window.glade.h:88
 msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
-"Funkcias por la ludiloj Rhythmbox kaj Muine. Por aliaj ludiloj, bonvolu "
-"viziti http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Kroma agordo de avizado..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Rigardilo:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Uzi _transportilajn piktogramarojn"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Dosieradministrilo:"
+msgid "Use system _default"
+msgstr "Uzi sisteman defaŭlton"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Tiparo:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kiam ricevas novan eventon"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Emfazi misskribajn vortojn"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Aŭtomate _fora post:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
+msgid "_Browser:"
+msgstr "_Rigardilo:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "Ve_nanta mesaĝo:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Montrataj babilstataj _avizoj:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "_Protokoli statŝanĝojn de kontaktoj"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Mienoj:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "Ret_poŝtkliento:"
+msgid "_File manager:"
+msgstr "_Dosieradministrilo:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Neniam"
+msgid "_Highlight misspelled words"
+msgstr "_Emfazi misskribajn vortojn"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Avizi min pri tio"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Malfermi..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignori formatadon en venantaj mesaĝoj"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "E_lira mesaĝo:"
+msgid "_Incoming message:"
+msgstr "Ve_nanta mesaĝo:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Ludilo:"
+msgid "_Log status changes of contacts"
+msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Antaŭigi la fenestron"
+msgid "_Mail client:"
+msgstr "Ret_poŝtkliento:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "_Reŝargi kolorojn per defaŭlto"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Aŭtomate nedisponebla post:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Ordigi kontaktojn per stato"
+msgid "_Open..."
+msgstr "_Malfermi..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "_Statmesaĝo:"
+msgid "_Outgoing message:"
+msgstr "E_lira mesaĝo:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_URL:"
+msgid "_Reset to Default Colors"
+msgstr "_Reŝargi kolorojn per defaŭlto"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Montrataj babilstataj _avizoj:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "_Statmesaĝo:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Eniri en babilejon"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Mankas en kontaktlisto"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutoj"
 
@@ -1758,6 +2157,10 @@ msgstr "Ĉiuj"
 msgid "Allow"
 msgstr "Permesi"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Rifuzi"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "Jabber-ID"
@@ -1766,7 +2169,7 @@ msgstr "Jabber-ID"
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1862
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Privata listo"
 
@@ -1806,145 +2209,177 @@ msgstr "sendi staton al mi"
 msgid "to view my status"
 msgstr "vidi mian staton"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Aldoni regulon</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Pri si"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Kaŝbildeto:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adreso"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Naskiĝtago:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Kaŝbildeto:"
+#: ../data/glade/vcard_information_window.glade.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:6
-msgid "Birthday:"
-msgstr "Naskiĝtago:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Urbo:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Klaku por starigi vian kaŝbildon"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Fako:"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Kompanio:"
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "Retpoŝtadreso:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Lando:"
-
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
-msgstr "Fako:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, 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:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "Retpoŝtadreso:"
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Familia nomo:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
-msgstr "Kroma adreso:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Propraj</b>"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
-msgstr "Familia nomo:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Hejmpaĝo:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: JJJJ-MM-TT"
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Aldoni regulon</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Nomo:"
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Kaŝnomo:"
+
+#: ../data/glade/profile_window.glade.h:20
 #: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
-msgstr "Hejmpaĝo:"
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono:"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Meznomo:"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Kondiĉoj</b>"
 
 #: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Poŝtkodo:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
 #: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Plu"
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Persona informo"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sonoj</b>"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/glade/profile_window.glade.h:27
 #: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefono:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Ofico:"
+#, 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:34
-msgid "Postal Code:"
-msgstr "Poŝtkodo:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sonoj</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Prefikso:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Pri si"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Rolo:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Ŝtato:"
+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:41
-msgid "Street:"
-msgstr "Strato:"
-
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Sufikso:"
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: JJJJ-MM-TT"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Persona informo"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Laboro"
 
@@ -1960,78 +2395,128 @@ msgstr "Forigi konton _nur el Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Forigi"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Peti por vidi lian/ŝian staton"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Aligi specialan _avizon"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Enigi Open_PGP-ŝlosilon"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2075
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Aranĝi _Grupojn"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2210
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Plenumi komandon..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2033
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_viti al"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Sendi unuopan _mesaĝon"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Forigi"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Sendi propran XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Sendi unuopan _mesaĝon..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Sendi _dosieron"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Ekparoli"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Permesi al li/ŝi vidi vian staton"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Malpermesi al li/ŝi vidi vian staton"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2027 ../src/roster_window.py:2124
-#: ../src/roster_window.py:2231
-msgid "_Remove from Roster"
-msgstr "_Forigi el kontaktlisto"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2219
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Renomigado de kontakto"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renomigi"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Abono"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "naŭ"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "K_ontoj"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Aldoni kontakton..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Aldoni _kontakton"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Servilaj trajtoj"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2045,51 +2530,90 @@ msgstr "Oftaj demandoj (rete)"
 msgid "Help online"
 msgstr "Helpo reta"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "_Vizitkarto"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Montri Trans_portilojn"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Montri _kontaktliston"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Enhavo"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoj"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Serĉi servojn"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Agoj"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Enhavo"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1284
-#: ../src/roster_window.py:2202
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "A_dministri"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_Respondaro"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Agordo"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Eliri"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Sendi unuopan _mesaĝon..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Vido"
 
+#: ../data/glade/search_window.glade.h:1
+msgid "Please wait while retrieving search form..."
+msgstr ""
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Aldoni _kontakton"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Kontakta informo"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Serĉi"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Ek"
@@ -2098,10 +2622,6 @@ msgstr "Ek"
 msgid "_Address:"
 msgstr "_Adreso:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtrilo:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registri ĉe"
@@ -2177,10 +2697,31 @@ msgstr "Mendo de abono"
 msgid "_Deny"
 msgstr "_Rifuzi"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
@@ -2193,57 +2734,73 @@ msgstr "Montri _kontaktliston"
 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:5
-msgid "Ask:"
-msgstr "Demandas:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Agoj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Kliento:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Propraj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber-ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Risurco:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Agordo</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Priskribo</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Propraj</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Komentoj"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Administri _babilejon"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Kontakta informo"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Risurco:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Stato:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Abono:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Plu"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Protokoli komunikadan historion"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Kaŝbildeto:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2253,11 +2810,6 @@ msgstr "<b>Jabber-trafiko</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML enigo</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ebligi"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2276,15 +2828,29 @@ msgstr "_Mesaĝo"
 msgid "_Presence"
 msgstr "_Ĉeesto"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Nomo:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Aligi specialan _avizon"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Familia nomo:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Enigi Open_PGP-ŝlosilon"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Aranĝi _Grupojn"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Renomigi"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Korekti konton..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2294,244 +2860,406 @@ msgstr "Loka JID:"
 msgid "Personal"
 msgstr "Persona"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Risurco:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Stato:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Korekti konton"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Uzi propran pordon:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Kontakta informo"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Ŝaltita"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Malŝaltita"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Bulea"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Entjera"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Koloro"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Parametra nomo"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valoro"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Datumtipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Mankas)"
 
-#. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Kaŝita"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Angla"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretona"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Germana"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Greka"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Brita"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Eŭska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Franca"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Itala"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norvega (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Pola"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazila Portugala"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Germana"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:208 ../src/dialogs.py:1516
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Se tiu lingvo ne estas por kiu vi volas emfazi mistajpojn, do bonvolu "
-"plenigi variablon $LANG per bezona valoro. Ekzemple por Esperanto: "
-"LANG=eo_EO aŭ export LANG=eo_EO.UTF-8 en ~/.bash_profile aŭ se, vi volas "
-"fari tion malloke, en /etc/profile.\n"
-"\n"
-"Emfazado de mistajpoj ne funkcios"
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
 
 #. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:856
-msgid "Chats"
-msgstr "Babilejoj"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Ĉifrado ebligata"
 
-#: ../src/chat_control.py:1038
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Mankas en kontaktlisto"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" de %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Ĉifrado malebligata"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Uzi aŭtentokontrolon"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Uzi aŭtentokontrolon"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "Nek %s publicis OpenPGP-ŝlosilon, nek vi enigis ĝin"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1263
-msgid "Encryption enabled"
-msgstr "Ĉifrado ebligata"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Komandoj: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s eksplodas)."
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "helpinformo mankas por /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
 
-#: ../src/chat_control.py:1268
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1410 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:845 ../src/gajim.py:846
-#: ../src/gajim.py:1190 ../src/roster_window.py:332
-#: ../src/roster_window.py:410 ../src/roster_window.py:1497
-#: ../src/roster_window.py:1507 ../src/roster_window.py:1683
-#: ../src/roster_window.py:1889 ../src/roster_window.py:2474
-#: ../src/roster_window.py:3904 ../src/roster_window.py:3906
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:43
-#: ../src/common/helpers.py:255
-msgid "Not in Roster"
-msgstr "Mankas en kontaktlisto"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
+
+#: ../src/chat_control.py:1854
+#, 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:1554
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2539,29 +3267,2596 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/config.py:137 ../src/config.py:586
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s nun estas %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "kreadas protokolan datumbazon"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s estas dosiero sed devas esti dosierujo"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim fermos tuj"
+
+#: ../src/common/check_paths.py:136
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s estas dosierujo sed devas esti dosiero"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "kreas dosierujon %s"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Kontakta informo"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Kontakto ŝanĝis sian staton"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Babilema"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "naŭ"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+#, fuzzy
+msgid "Do not disturb"
+msgstr "Ne malhelpu."
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Priskribo"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Nova babilejo"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s de babilejo %(room_name)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "%s aliĝis al la babilejo"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Babilejoj"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Vi jam estas en babilejo %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr " %d nelegita mesaĝo"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Aŭtomate fora"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedisponebla."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Nedisponebla pro longa senfarado"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Defaŭlte"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Ebligi lig-lokan/zerokonf komunikadon"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Lingvo uzata de literumilo"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - eligi tempon por ĉiuj mesaĝo.\n"
+"'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
+"'never' - neniam eligi tempon."
+
+#: ../src/common/config.py:121
+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 ""
+"Eligi tempon en konversacioj per malpreciza horloĝo. Nivelo de malprecizeco "
+"de 1 ĝis 4 aŭ 0 por malŝalti malprecizan horloĝon. 1 estas por la plej "
+"preciza, 4 por la malplej preciza. Ĉi tio uzatas nur kiam print_time estas "
+"'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Trakti parojn * / _ kiel stiligajn signojn."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
+"* *."
+
+#: ../src/common/config.py:128
+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 ""
+"Uzas restrukturitan tekstan markadon por HTML, kaj ASCII-formatadon, se "
+"elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
+"babilejo."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
+"tiun kaŝnomon."
+
+#: ../src/common/config.py:161
+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 ""
+"Ĉi tiu opcio ebligas agordi formon de tempo kiu eligitos ĉe konversacio. "
+"Ekzemple \"[%H:%M] \" montros tempon kiel \"[horo:minuto] \". Pli detale "
+"vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
+"org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
+"malfermas denove."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
+"kondutmaniero de Mirabilis ICQ Kliento)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Kiom lineojn memori por Ctrl+Supren."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
+"\" kio signifas uzi wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Se \"True\", aŭskulti D-Bus-signalojn de Retadministrilo(NetworkManager) kaj "
+"ŝanĝi la statojn de kontoj (kiuj havas parametrojn "
+"listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
+"la stato de la retkonekto."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
+"\"all\", \"composing_only\", aŭ \"disabled\"."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Montrataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
+"\"all\", \"composing_only\", aŭ \"disabled\"."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
+"ĉiujn x minutojn."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
+"listo de babilejaj JID."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
+"babilejaj JID separataj per spacetoj."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
+"adrestradukado."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Avizi eventojn en la sistema taskopleta bildeto."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Ĉu montri fermontan butonon en sliplangeto?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
+
+#: ../src/common/config.py:219
+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 ""
+"Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
+"Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"se \"True\", Gajim kontrolos ĉu ĝi estas defaŭlta jabber-kliento dum ĉiu "
+"lanĉo."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
+"nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
+"ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Se \"True\", Gajim demandos pri kaŝbildeto ĉiun kontakton, kiu ne havis ĝin "
+"lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
+
+#: ../src/common/config.py:229
+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 ""
+"Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
+"kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
+
+#: ../src/common/config.py:230
+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 ""
+"povas esti \"none\", \"all\" aŭ \"in_and_out\". Se \"none\", Gajim ne plu "
+"eligos statlineon en babilejoj kiam membro ŝanĝas sian staton aŭ "
+"statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
+"Gajim eligos nur pri eniroj/eliroj."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Se \"True\", rememoritaj mesaĝoj uzos pli malgrandan tiparon ol defaŭltaj."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Ne montri kaŝbildeton por transportilo mem."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Ne montri kontaktliston en la sistema taskostrio."
+
+#: ../src/common/config.py:238
+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 ""
+"Se \"True\" kaj instalitas GTK+ kaj PyGTK versioj almenaŭ 2.8, fari la "
+"fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
+"kiam estas atendantaj eventoj."
+
+#: ../src/common/config.py:240
+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 ne ŝatas SHA informon kiam iu konektas al pasvortprotekta "
+"babilejo. Valorigu tiun opcion per \"False\" por halti sendadon de SHA "
+"informon en babilejo."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Administras fenestron kien novaj mesaĝoj metitas:\n"
+"'always' - ĉiuj mesaĝoj en unu fenestron;\n"
+"'never' - ĉiu mesaĝo en lian propran fenestron;\n"
+"'peracct' - mesaĝoj de ĉiu konto en apartan fenestron;\n"
+"'pertype' - ĉiu mesaĝtipo (ekzemple babileja aŭ dupersoninterparola) en "
+"apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
+"antaŭ la ŝanĝo efikos."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Kaŝas la butonojn en babileja fenestro."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Kaŝas rubandon en babileja fenestro"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Kaŝas rubandon en dupersona interparola fenestro"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
+
+#: ../src/common/config.py:250
+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 ""
+"En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
+"sama persono dirinta ĉi-antaŭan mesaĝon."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Sendi mesaĝon kaj fermi fenestron"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr "Listo de koloroj kiuj estos uzata por kolorigi kaŝnomojn en babilejoj."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
+"Malplena linio signifas ke ni neniam monru la dialogujon."
+
+#: ../src/common/config.py:256
+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 ""
+"Se \"True\", vi povos valorigi prioritaton de via konto per negativaj "
+"nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
+"negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
+"pasvortojn."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
+"kontaj kaj grupaj linioj."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Povas esti malplena, 'chat' aŭ 'normal'. Se ne malplena, rigardi ĉiujn "
+"venantajn mesaĝojn kiel ili estas de ĉi tiu tipo"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
+"agorderoj \"autopriority_*\"."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 ĉirkaŭiro"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
+"file_transfer_proxies por dosiertransmeto."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "'all' aŭ spacetseparitaj statoj"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no', aŭ 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' aŭ ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Dormas"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Revenos baldaŭ"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Revenos post kelkaj minutoj."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Manĝas"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Mi manĝas, do restigu mesaĝon por mi."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Kino"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Mi spektas filmon."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Laboras"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Mi laboras."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefonado"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Mi telefonas."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Eliris"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Mi eliris por amuziĝi."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Mi disponeblas."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Mi babilemas."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Revenos baldaŭ."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Mi ne disponeblas."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Ne malhelpu."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Ĝis!"
+
+#: ../src/common/config.py:441
+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 ""
+"Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
+"muc_highlight_words, aŭ vian kaŝnomon."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "verda"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "manĝbutiko"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "homa"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "mara"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Neeblas ŝargi senfaran modulon"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Malprava servilnomo"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Kromaĵo ne subtenatas"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Kaŝnomo malpermesita: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Neeblas aliĝi al babilejo"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Al vi oni malpermesis esti en la babilejo."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Tiu babilejo ne ekzistas."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Babileja kreado limigitas."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Vi devas uzi vian registritan kaŝnomon."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Vi ne ĉeestas en membrolisto."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Permeso estas forigita"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Mi volus aldoni vin al mia kontaktlisto."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "nun ni abonas %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "ordono pri abona fino de %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "ni nun ne abonas pri %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. Uzu "
+"kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP-pasfrazo ne estis donita"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Vi estos konektita al %s sen OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Neeblas ŝargi senfaran modulon"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+#, fuzzy
+msgid "CRL is not yet valid"
+msgstr "%s ne estas valida protokola detalnivelo"
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Konekto kun konto \"%s\" rompiĝis"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Rekonektu mane."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transportilo %s respondis malprave al registra peto: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nekonata versio de D-BUS: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Nekorekta respondo"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transportilo %s respondis malprave al registra peto: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Ne povas konekti al \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Kontrolu vian konekton aŭ provu denove poste."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Ne povas konekti al \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Konekto kun konto \"%s\" rompiĝis"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Nekonata versio de D-BUS: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Kontrolu vian konekton aŭ provu denove poste"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Eraro dum forigado de privata listo"
+
+#: ../src/common/connection.py:801
+#, 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 ""
+"Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
+"konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Temo: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Ne obtenita pro nevidebla stato"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Rigardiloj"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transportiloj"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Mankas en kontaktlisto"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Pitona bindmodulo por D-BUS mankas cxe tiu cxi komputilo"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Kontnomo ne povas esti malplena."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Seancbuso nedisponeblas.\n"
+"Provu legi http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "unu"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "du"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tri"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "kvar"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "kvin"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "ses"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "sep"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "ok"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "naŭ"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "dek"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "dekunu"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "dekdu"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "la $0a horo"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "kvin minutoj post la $0a"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "dek minutoj post la $0a"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "kvarono post la $0a"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "dudek minutoj post la $0a"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "dudek kvin minutoj post la $0a"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "la $0a kaj duono"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "dudek kvin minutoj antaŭ la $1a"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "dudek minutoj antaŭ la $1a"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "kvarono antaŭ la $1a"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "dek minutoj antaŭ la $1a"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "kvin minutoj antaŭ la $1a"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "la $1a horo"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Nokto"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Frua mateno"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Mateno"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Preskaŭ tagmezo"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Tagmezo"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Posttagmezo"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Vespero"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Malfrua vespero"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Komenco de semajno"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Mezo de semajno"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Fino de semajno"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Semajnofino!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Malkorekta signo en salutnomo."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Necesas adreso de servilo."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Malkorekta signo en servilnomo."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Malkorekta signo en risurcnomo."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Okupata"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Okupata"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Nedisponebla"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Babilema"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Babilema"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Enrete"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Enrete"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Konektas"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Fora"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Senkonekta"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Senkonekta"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "Ne_videbla"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Nekonata"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Eraroj"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Neniu"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Al"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Ambaŭ"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Nenion"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Aboni"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Neniu"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderigantoj"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderiganto"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Partoprenantoj"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Partoprenanto"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Vizitantoj"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Vizitanto"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Neniu"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Mastro"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administristo"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Membro"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "atentas al la komunikado"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "faras ion alian"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "tajpas mesaĝon..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "paŭzas tajpi mesaĝon"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "fermis la interparolan fenestron aŭ slipon"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Sendi mesaĝon"
+msgstr[1] "Sendi mesaĝon"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "eraro: %s nedisponeblas por legi"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "blua"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "indeksigas protokolan datumbazon"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim-konto %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Paŭzas"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Dika"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Havas "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Babilejoj"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Dika"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Enhavo"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Plenumita"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Enhavo"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Malŝaltita"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "uri"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Forigi"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "malŝaltitaj"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "malŝaltitaj"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Ŝaltita"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Retnodo:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "mesaĝo"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Ŝaltita"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Nevidebla"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "unu"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Retnodo:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Germana"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Korekti"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Senkonekta"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "dekunu"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Malrapidas"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+msgid "Satisfied"
+msgstr ""
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Kaŝnomo"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Dormas"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Strato:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Abonita"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tempo"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Substreko"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Malprava servilnomo"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Vespero"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Tajpas mesaĝon"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Mateno"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "ĉiuj en la grupo"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Laboras"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Vespero"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Elpelatas %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Aliĝi"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Laboras"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Laboras"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "babilejo"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Manĝas"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Korektas temon"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Elpelatas %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Manĝas"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Laboras"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Elpelatas %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Manĝas"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "E_lsalutas"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Manĝas"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Kialo"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Kialo"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Dormas"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Laboras"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Manĝas"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Mi spektas filmon."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Manĝas"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Mi telefonas."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Transdonas"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Tajpas mesaĝon"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Malfermi  kiel _ligilon"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Laboras"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Tajpas mesaĝon"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Laboras"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Ĉiujn %s _minutojn"
+msgid "Unable to bind to port %s."
+msgstr "Neeblas aliĝi al pordo %s."
 
-#: ../src/config.py:351
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
+"estos nuligita."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"La servilnomo, specifita de vi en la agordero \"ft_override_host_to_send\" "
+"de la detala agordo, ne ekzistas aŭ malkorektas, tial estas ignorata."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Eraro de Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Lig-loka komunikado ne povas funkcii korekte."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Bonvolu certiĝi ke Avahi estas instalita."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Ne povas lanĉi lokan servon"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Neeblas aliĝi al pordo %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Ne povas ŝanĝi staton de konto \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "eraro dum aldonado de servo %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "malŝaltitaj"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:359
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:682 ../src/gajim.py:2225
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Defaŭlta statmesaĝo"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Ebligi"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Propraj</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:683 ../src/gajim.py:2226
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2570,241 +5865,250 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1000
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1000
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
-#: ../src/config.py:1036
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:1037
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Sekva mesaĝo ricevita"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:1039
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:1041
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:1042
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/config.py:1252
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Nomo"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Ĉu rekonektu nun?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1298
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Nelegitaj eventoj"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Vi havas aktivan konversacion ĉe konto %s"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1299
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1302 ../src/config.py:1901
-msgid "Unread events"
-msgstr "Nelegitaj eventoj"
-
-#: ../src/config.py:1303
+#: ../src/config.py:1710
 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:1307
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1717
 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:1312 ../src/config.py:1316
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1313
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1317
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:3004
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Administri kontojn"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Enigu novan nomon por la grupo %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/config.py:1332
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:1391
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:1392
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:1520 ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Revenos baldaŭ."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:1530
-msgid "Relogin now?"
-msgstr "Ĉu rekonektu nun?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:1531
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:1557
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:1558
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:1565 ../src/dialogs.py:1130 ../src/dialogs.py:1316
-#: ../src/disco.py:419 ../src/profile_window.py:323
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:1570
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:1571
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:1595 ../src/config.py:3392
-msgid "Failed to get secret keys"
-msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
-
-#: ../src/config.py:1596 ../src/config.py:3393
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
-
-#: ../src/config.py:1599 ../src/config.py:3396
-msgid "OpenPGP Key Selection"
-msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
-
-#: ../src/config.py:1600 ../src/config.py:3397
-msgid "Choose your OpenPGP key"
-msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
-
-#. Name column
-#: ../src/config.py:1835 ../src/disco.py:740 ../src/disco.py:1495
-#: ../src/disco.py:1733 ../src/history_window.py:78
-msgid "Name"
-msgstr "Nomo"
-
-#: ../src/config.py:1838
-msgid "Server"
-msgstr "Servilo"
-
-#: ../src/config.py:1902
-msgid "Read all pending events before removing this account."
-msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
-
-#: ../src/config.py:1939
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Vi havas aktivan konversacion ĉe konto %s"
-
-#: ../src/config.py:1940
-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:1999
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2000
+#: ../src/config.py:2134
 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:2234
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2236
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2302
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2303
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2304
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2305
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2338 ../src/disco.py:747 ../src/history_manager.py:155
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2351
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2378
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2812,11 +6116,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2381
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2824,11 +6128,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2384
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2836,11 +6140,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2387
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2848,7 +6152,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2864,101 +6168,85 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2510 ../src/roster_window.py:2732
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2511 ../src/roster_window.py:2728
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2512 ../src/roster_window.py:2733
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2526
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2527
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2612
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:2612
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:2613
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:2614
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:2682
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
 "tiun ĉi legosignon."
 
-#: ../src/config.py:2979
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:2980
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:2990 ../src/dialogs.py:1335
-msgid "Invalid password"
-msgstr "Malkorekta pasvorto"
-
-#: ../src/config.py:2991
-msgid "You must enter a password for the new account."
-msgstr "Vi devas enigi pasvorton por la nova konto."
-
-#: ../src/config.py:2995 ../src/dialogs.py:1340
-msgid "Passwords do not match"
-msgstr "Pasvortoj diversas"
-
-#: ../src/config.py:2996 ../src/dialogs.py:1341
-msgid "The passwords typed in both fields must be identical."
-msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
-
-#: ../src/config.py:3015
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Ripeta Jabber-ID"
 
-#: ../src/config.py:3016
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
 
-#: ../src/config.py:3033
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3034 ../src/config.py:3069
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -2967,272 +6255,397 @@ 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:3068
-msgid "Your new account has been created successfully"
-msgstr "Via nova konto estas sukcese kreita"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kontakto jam estas en kontaktlisto"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
 
-#: ../src/config.py:3086
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3144
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Via nova konto estas sukcese kreita"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3145
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/conversation_textview.py:754
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Antaŭ %i tagoj"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:792
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber-tujmesaĝilo"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "En la grupo"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Ŝlosil-ID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Enigi tagmesaĝon"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Statmesaĝo"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni ĉe konto %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Mi volus aldoni vin al mia kontaktlisto."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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:778
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:908
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Neeblas aliĝi al pordo %s."
-
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
+"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 ""
-"Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
-"estos nuligita."
+"Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
+"lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1060
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, 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:1063
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:1123 ../src/roster_window.py:686
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1686
 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:1146
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:1214 ../src/dialogs.py:1220
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:1215 ../src/dialogs.py:1221
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:1267
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Servilo"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Konto \"%s\" estas konektita al la servilo"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:1269
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3241,270 +6654,376 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1295 ../src/dialogs.py:1654 ../src/dialogs.py:1785
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:1296 ../src/dialogs.py:1655 ../src/dialogs.py:1786
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:1305 ../src/dialogs.py:1308
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:1308
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:1336
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Malkorekta pasvorto"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Pasvortoj diversas"
+
+#: ../src/dialogs.py:2025
+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:1383 ../src/notify.py:212 ../src/notify.py:416
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:1385 ../src/notify.py:220 ../src/notify.py:418
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
-#: ../src/dialogs.py:1387 ../src/notify.py:239 ../src/notify.py:420
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:1387 ../src/notify.py:224 ../src/notify.py:420
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:1388 ../src/notify.py:231 ../src/notify.py:421
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:1388 ../src/gajim.py:1285 ../src/notify.py:429
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:1390 ../src/gajim.py:1438 ../src/notify.py:423
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:1392 ../src/gajim.py:1257 ../src/gajim.py:1414
-#: ../src/notify.py:425
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:1394 ../src/gajim.py:1477 ../src/gajim.py:1499
-#: ../src/gajim.py:1516 ../src/notify.py:427
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:1395 ../src/gajim.py:1480 ../src/notify.py:427
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:1397 ../src/gajim.py:1154 ../src/notify.py:431
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:1399 ../src/notify.py:204 ../src/notify.py:433
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:1584
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:1586
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:1588
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1591
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1686
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:1731
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML-konzolo"
 
-#: ../src/dialogs.py:1856
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:1908
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, 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:1911
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:1953
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:2040
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:2136
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:2138
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Al vi oni malpermesis esti en la babilejo."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2255
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:2317
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:2327 ../src/dialogs.py:2372
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:2362
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
 #. # means number
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "n°"
 
-#: ../src/dialogs.py:2513
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:2634
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/disco.py:103
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Aliaj"
 
-#: ../src/disco.py:104 ../src/disco.py:105 ../src/disco.py:1281
-#: ../src/gajim.py:599 ../src/roster_window.py:271 ../src/roster_window.py:329
-#: ../src/roster_window.py:368 ../src/roster_window.py:450
-#: ../src/roster_window.py:482 ../src/roster_window.py:484
-#: ../src/roster_window.py:3900 ../src/roster_window.py:3902
-#: ../src/common/contacts.py:267 ../src/common/contacts.py:282
-#: ../src/common/helpers.py:43
-msgid "Transports"
-msgstr "Transportiloj"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:107
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:420
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:501
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:641
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3512,206 +7031,467 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:646 ../src/disco.py:927
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:647
+#: ../src/disco.py:662
 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:727
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:928
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1155 ../src/disco.py:1286
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Plenumi komandon..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1323
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1504
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1511
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1518
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1741
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:1767
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Neniu"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:1773
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:1779
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Historia administrilo"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Mesaĝo sendita"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Ĉifrado per OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Ve_nanta mesaĝo:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Ĝenerala"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Servilaj trajtoj"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Dosiero"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Dosiertransmeto plenumitas"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Dosiera transmeto nuligitas"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Konekto kun punkto neestableblas."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Dosiertransmeto estas hatlita de aliflanka kontakto"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Elektu dosieron por sendi..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Priskribo: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Tiu ĉi dosiero estas uzata de alia procezo."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Dosiero: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Priskribo: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:748
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:750
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:326 ../src/gtkgui_helpers.py:754
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:754
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:764
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:765
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Konservi dosieron kiel..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3719,65 +7499,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Malkorekta dosiero"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Dosiero: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim bezonas X-servilon. Finas..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:186
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Mankas subteno de libglade en GTK+"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3786,22 +7566,22 @@ msgstr ""
 "Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
 "stabilan version de %s"
 
-#: ../src/gajim.py:139
+#: ../src/gajim.py:199
 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:144
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim bezonas PySqlITE2 por funkcii"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim bezonas pywin32 por funkcii"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3811,11 +7591,11 @@ msgstr ""
 "povas preni ĝin ĉe %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:296
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3823,172 +7603,391 @@ msgstr ""
 "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim.py:403
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Pasfrazo necesas"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/gajim.py:404
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Malprava pasfrazo"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
+"Bonvolu specifi alian kaŝnomon jene:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gajim.py:450 ../src/notify.py:435
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Ĉu vi akceptas tiun peton?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gajim.py:770
-#, python-format
-msgid "Subject: %s"
-msgstr "Temo: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:815 ../src/gajim.py:828
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gajim.py:861
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gajim.py:862
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
 
-#: ../src/gajim.py:870
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gajim.py:871
-msgid "You will always see him or her as offline."
-msgstr "Vi ĉiam vidos ŝin aŭ lin senkonekta."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:914
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gajim.py:915 ../src/common/connection.py:418
-msgid "Check your connection or try again later."
-msgstr "Kontrolu vian konekton aŭ provu denove poste."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s nomiĝas %s"
 
-#: ../src/gajim.py:1064 ../src/roster_window.py:1217
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s nun estas %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s nun estas %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1067 ../src/groupchat_control.py:952
-#: ../src/roster_window.py:1220
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s nun estas %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1164
-msgid "Your passphrase is incorrect"
-msgstr "Via pasfrazo estas malvalida"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
 
-#: ../src/gajim.py:1165
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Necesas pasvorto por aliĝi al la babilejo."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gajim.py:1268
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Via pasfrazo estas malvalida"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1270
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1279
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"De: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
 
 #. ft stopped
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: ../src/gajim.py:1517
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1521
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gajim.py:1634
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "En ĉ_iu mesaĝo"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gajim.py:1635
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Konflikto de salutnomoj"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Konekto"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Ne plu demandi"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Ĉifrado malebligata"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1975
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gajim.py:2173
-msgid "Network Manager support not available"
-msgstr "Subteno de retadministrilo mankas"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Legosigno jam estas metita"
 
-#: ../src/gajim.py:2252
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Legosigno sukcese aldonitas"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -3996,48 +7995,48 @@ msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "mesaĝo"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4046,19 +8045,19 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Montras interparolan fenestron do vi povas sendi mesaĝon al kontakto"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:128
 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 "
@@ -4068,27 +8067,29 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "PGP-ŝlosilo"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141
 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 "
@@ -4098,125 +8099,134 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID de kontakto, kiu ricevos la mesaĝon"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Aldonas novan kontakton en tiun konton"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4224,35 +8234,72 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Prilabori xmpp:/ uri"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Babilejo:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Pasvortoj diversas"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4261,29 +8308,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uzado: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4292,149 +8341,200 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:438
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:442
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Malprava uri"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Etoso"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Vi ne povas forigi aktivan etoson"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "Etosa nomo"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Vi ne povas forigi aktivan etoson"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privata interparolo"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Privataj interparoloj"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:144
-msgid "Group Chat"
-msgstr "Babilejo"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Babilejoj"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Historio de interparoloj"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Konekto"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Via nova konto estas sukcese kreita"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:1142
 #, 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:848
+#: ../src/groupchat_control.py:1149
 #, 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:852
+#: ../src/groupchat_control.py:1153
 #, 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:860
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Aparteneco:"
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s nomiĝas %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s estas elpelita: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
-#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Tiu ĉi babilejo ne havas temon"
 
-#: ../src/groupchat_control.py:1118
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invititas al %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "Tio ne estas valida JID: %s"
-
-#: ../src/groupchat_control.py:1236
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Ne estas tiu komando: /%s (se vi volas sendi tion, metu /say antaŭen)"
-
-#: ../src/groupchat_control.py:1259
-#, python-format
-msgid "Commands: %s"
-msgstr "Komandoj: %s"
-
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4446,7 +8546,7 @@ msgstr ""
 "babilejo. Eblas uzi la kaŝnomon de uzulo, sed ne se ĝi entenas \"@\" aŭ "
 "spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
 
-#: ../src/groupchat_control.py:1268
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4455,12 +8555,7 @@ msgstr ""
 "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
 "specifita persono."
 
-#: ../src/groupchat_control.py:1272
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
-
-#: ../src/groupchat_control.py:1274
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4469,12 +8564,7 @@ msgstr ""
 "Uzado: /%s [kialo], - fermas la nuntempan fenestron aŭ slipon, informe pri "
 "kialo se specifita."
 
-#: ../src/groupchat_control.py:1277
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4483,7 +8573,7 @@ msgstr ""
 "Uzado: /%s <JID> [kialo], - invitas JID al la nuntempa babilejo, fakultative "
 "informante pri kialo."
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4492,7 +8582,7 @@ msgstr ""
 "Uzado: /%s <babilejo>@<servilo>[/kaŝnomo], - aliĝas al room@server "
 "fakultative uze specifitan kaŝnomon."
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4502,15 +8592,7 @@ msgstr ""
 "Uzado: /%s <kaŝnomo> [kialo], - forigas la uzulon specifitan per kaŝnomo el "
 "la babilejo kaj fakultative montras kialon. NE SUBTENAS spacetojn en kaŝnomo."
 
-#: ../src/groupchat_control.py:1293
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s eksplodas)."
-
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4519,202 +8601,186 @@ msgstr ""
 "Uzado: /%s <kaŝnomo> [mesaĝo], malfermas privatan mesaĝan fenestron kaj "
 "sendas mesaĝon al la uzulo specifita per kaŝnomo."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
 
-#: ../src/groupchat_control.py:1306
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
 
-#: ../src/groupchat_control.py:1310
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uzado: /%s [temo], - eligas aŭ novigas la nuntempan babilejan temon."
 
-#: ../src/groupchat_control.py:1313
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uzado: /%s <mesaĝo>, - sendas mesaĝon preter rekonado de aliaj komandoj."
 
-#: ../src/groupchat_control.py:1316
-#, python-format
-msgid "No help info for /%s"
-msgstr "helpinformo mankas por /%s"
-
-#: ../src/groupchat_control.py:1378
+#: ../src/groupchat_control.py:1837
 #, 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:1380
+#: ../src/groupchat_control.py:1839
 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:1384 ../src/roster_window.py:4040
-msgid "Do _not ask me again"
-msgstr "_Ne plu demandi"
-
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1419
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1428
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: ../src/groupchat_control.py:1454
-msgid "Bookmark already set"
-msgstr "Legosigno jam estas metita"
-
-#: ../src/groupchat_control.py:1455
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1464
-msgid "Bookmark has been added successfully"
-msgstr "Legosigno sukcese aldonitas"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1465
-msgid "You can manage your bookmarks via Actions menu in your roster."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
 msgstr ""
-"Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1593
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:1594 ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Programa eraro estas detektita"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr "Tio eble ne estas fatala, sed malgraŭ raportinda al la programistoj."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Raporti pri eraro"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detalaĵoj"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:359
 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:376
+#: ../src/gtkgui_helpers.py:396
 #, 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:692
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ne estas defaŭlta jabber-kliento"
 
-#: ../src/gtkgui_helpers.py:693
+#: ../src/gtkgui_helpers.py:734
 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:694
+#: ../src/gtkgui_helpers.py:735
 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:793
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:794
+#: ../src/gtkgui_helpers.py:805
 #, 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:803
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontaktoj"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mesaĝo"
 
-#. holds subject
-#: ../src/history_manager.py:142 ../src/history_manager.py:173
-msgid "Subject"
-msgstr "Temo"
-
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:224
 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:189
+#: ../src/history_manager.py:226
 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 "
@@ -4728,208 +8794,261 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Eksportas protokolojn..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:199
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s nun estas %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Ne povas alŝuti bildon"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Babilejoj"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Babilejoj"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Privataj interparoloj"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:197
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova unuopa mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privata mesaĝo de babilejo %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova mesaĝo de %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Ĝenerala"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Dosierindiko"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Tiu babilejo ne ekzistas."
+
 #. keep identation
-#: ../src/profile_window.py:143
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:324
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:336
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:351
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:359
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/roster_window.py:171 ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:344 ../src/common/helpers.py:43
-msgid "Observers"
-msgstr "Rigardiloj"
-
-#: ../src/roster_window.py:691 ../src/roster_window.py:3205
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Permeso estas sendita"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:883 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "per konto %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Ekde nun \"%s\" konos vian staton."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:908
-#, python-format
-msgid "to %s account"
-msgstr "al konto %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Demando pri abono estas sendita"
 
-#. disco
-#: ../src/roster_window.py:913
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "per konto %s"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:988
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Permeso estas forigita"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "de konto %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:1008
-msgid "_Manage Bookmarks..."
-msgstr "Aranĝi _legosignojn..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
+"(medivariablo eble ne korekte valorizitas)"
 
-#: ../src/roster_window.py:1037
-#, python-format
-msgid "for account %s"
-msgstr "por konto %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1058
-msgid "History Manager"
-msgstr "Historia administrilo"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:1067
-msgid "_Join New Group Chat"
-msgstr "_Eniri babilejen"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:1397 ../src/roster_window.py:3398
-#: ../src/roster_window.py:3405
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
+
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:1401
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -4937,128 +9056,66 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:1405
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:1410
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1430
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:1438
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:1514
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2734
 #, 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:1516
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, 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:1545
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:1781 ../src/roster_window.py:2042
-msgid "_New group chat"
-msgstr "_Nova babilejo"
-
-#: ../src/roster_window.py:1912
-msgid "I would like to add you to my roster"
-msgstr "Mi volus aldoni vin en mian kontaktliston"
-
-#: ../src/roster_window.py:2087 ../src/roster_window.py:2134
-msgid "Send Group M_essage"
-msgstr "Sendi _grupan mesaĝon"
-
-#: ../src/roster_window.py:2113
-msgid "Re_name"
-msgstr "Re_nomigi"
-
-#: ../src/roster_window.py:2140
-msgid "To all users"
-msgstr "Al ĉiuj uzantoj"
-
-#: ../src/roster_window.py:2143
-msgid "To all online users"
-msgstr "Al ĉiuj konektitaj uzantoj"
-
-#: ../src/roster_window.py:2179
-msgid "_Log on"
-msgstr "E_nsaluti"
-
-#: ../src/roster_window.py:2189
-msgid "Log _off"
-msgstr "E_lsaluti"
-
-#: ../src/roster_window.py:2311 ../src/roster_window.py:2382
-msgid "_Change Status Message"
-msgstr "Ŝanĝi stat_mesaĝon"
-
-#: ../src/roster_window.py:2454
-msgid "Authorization has been sent"
-msgstr "Permeso estas sendita"
-
-#: ../src/roster_window.py:2455
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Ekde nun \"%s\" konos vian staton."
-
-#: ../src/roster_window.py:2475
-msgid "Subscription request has been sent"
-msgstr "Demando pri abono estas sendita"
-
-#: ../src/roster_window.py:2476
-#, 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:2488
-msgid "Authorization has been removed"
-msgstr "Permeso estas forigita"
-
-#: ../src/roster_window.py:2489
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
-
-#: ../src/roster_window.py:2679
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:2683
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5066,7 +9123,13 @@ msgstr ""
 "Forigante tiun kontakton vi forigas ankaŭ permeson, rezulte ŝi aŭ li ĉiam "
 "vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2688
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Kion vi volas fari?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5074,16 +9137,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:2691
+#: ../src/roster_window.py:3144
 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:2695
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:2699
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5092,92 +9155,33 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2731
-msgid ""
-"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)"
-
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2759 ../src/common/connection.py:672
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Vi estos konektita al %s sen OpenPGP."
-
-#: ../src/roster_window.py:2776
-msgid "Passphrase Required"
-msgstr "Pasfrazo necesas"
-
-#: ../src/roster_window.py:2777
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
-
-#: ../src/roster_window.py:2782
-msgid "Save passphrase"
-msgstr "Konservi pasfrazon"
-
-#: ../src/roster_window.py:2790
-msgid "Wrong Passphrase"
-msgstr "Malprava pasfrazo"
-
-#: ../src/roster_window.py:2791
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
-
-#: ../src/roster_window.py:2848 ../src/roster_window.py:2908
-msgid "You are participating in one or more group chats"
-msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
-
-#: ../src/roster_window.py:2849 ../src/roster_window.py:2909
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2866
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:2867
+#: ../src/roster_window.py:3192
 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:2965
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" de %(artist)s"
-
-#: ../src/roster_window.py:3399 ../src/roster_window.py:3406
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
-
-#: ../src/roster_window.py:3990
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:3992
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:4034
+#: ../src/roster_window.py:3784
 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:4036
+#: ../src/roster_window.py:3786
 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 "
@@ -5187,110 +9191,321 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4203
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Malkorekta dosiero"
+
+#: ../src/roster_window.py:3910
+#, 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:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Movi %s en la grupon %s"
+msgid "using account %s"
+msgstr "per konto %s"
 
-#: ../src/roster_window.py:4210
+#. add
+#: ../src/roster_window.py:4674
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Igi %s kaj %s metakontaktoj"
+msgid "to %s account"
+msgstr "al konto %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "per konto %s"
 
-#: ../src/roster_window.py:4397
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "Aranĝi _legosignojn..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "de konto %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "por konto %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "Ŝanĝi stat_mesaĝon"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publici"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Aktiva"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Serĉi servojn..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Sendi _grupan mesaĝon"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Al ĉiuj uzantoj"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Al ĉiuj konektitaj uzantoj"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Mi volus aldoni vin en mian kontaktliston"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Renomigado de kontakto"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Sendi unuopan mesaĝon"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportiloj"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Montri Trans_portilojn"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakto malkonektita"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Nova babilejo"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Historia administrilo"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Eniri babilejen"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Temo: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/systray.py:232
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Risurco: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Konekto"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontakto malkonektita"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abono: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Babilejo:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Ŝaltita"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipo:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5298,24 +9513,25 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Aparteneco:"
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5323,1396 +9539,441 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 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:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " risurco kun prioritato "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "kreadas protokolan datumbazon"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, 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:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim fermos tuj"
-
-#: ../src/common/check_paths.py:115
-#, 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:131
-#, python-format
-msgid "creating %s directory"
-msgstr "kreas dosierujon %s"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Aŭtomate fora"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedisponebla."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Nedisponebla pro longa senfarado"
-
-#: ../src/common/config.py:83
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Ebligi lig-lokan/zerokonf komunikadon"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Lingvo uzata de literumilo"
-
-#: ../src/common/config.py:92
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'always' - eligi tempon por ĉiuj mesaĝo.\n"
-"'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
-"'never' - neniam eligi tempon."
-
-#: ../src/common/config.py:93
-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 ""
-"Eligi tempon en konversacioj per malpreciza horloĝo. Nivelo de malprecizeco "
-"de 1 ĝis 4 aŭ 0 por malŝalti malprecizan horloĝon. 1 estas por la plej "
-"preciza, 4 por la malplej preciza. Ĉi tio uzatas nur kiam print_time estas "
-"'sometimes'."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Trakti parojn * / _ kiel stiligajn signojn."
-
-#: ../src/common/config.py:97
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
-"* *."
-
-#: ../src/common/config.py:100
-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 ""
-"Uzas restrukturitan tekstan markadon por HTML, kaj ASCII-formatadon, se "
-"elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
-"babilejo."
-
-#: ../src/common/config.py:110
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
-"tiun kaŝnomon."
-
-#: ../src/common/config.py:133
-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 ""
-"Ĉi tiu opcio ebligas agordi formon de tempo kiu eligitos ĉe konversacio. "
-"Ekzemple \"[%H:%M] \" montros tempon kiel \"[horo:minuto] \". Pli detale "
-"vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
-"org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
-"malfermas denove."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
-"kondutmaniero de Mirabilis ICQ Kliento)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Kiom lineojn memori por Ctrl+Supren."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
-"\" kio signifas uzi wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
-
-#: ../src/common/config.py:154
-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 ""
-"Se \"True\", aŭskulti D-Bus-signalojn de Retadministrilo(NetworkManager) kaj "
-"ŝanĝi la statojn de kontoj (kiuj havas parametrojn "
-"listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
-"la stato de la retkonekto."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
-"\"all\", \"composing_only\", aŭ \"disabled\"."
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Montrataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
-"\"all\", \"composing_only\", aŭ \"disabled\"."
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
-"ĉiujn x minutojn."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
-"listo de babilejaj JID."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
-"babilejaj JID separataj per spacetoj."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
-"adrestradukado."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Avizi eventojn en la sistema taskopleta bildeto."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Ĉu montri fermontan butonon en sliplangeto?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
-
-#: ../src/common/config.py:190
-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 ""
-"Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
-"Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
-
-#: ../src/common/config.py:191
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"se \"True\", Gajim kontrolos ĉu ĝi estas defaŭlta jabber-kliento dum ĉiu "
-"lanĉo."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
-"nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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 ""
-"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:196
-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 ""
-"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:197
-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 ""
-"povas esti \"none\", \"all\" aŭ \"in_and_out\". Se \"none\", Gajim ne plu "
-"eligos statlineon en babilejoj kiam membro ŝanĝas sian staton aŭ "
-"statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
-"Gajim eligos nur pri eniroj/eliroj."
-
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
-
-#: ../src/common/config.py:202
-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:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Ne montri kaŝbildeton por transportilo mem."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Ne montri kontaktliston en la sistema taskostrio."
-
-#: ../src/common/config.py:205
-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 ""
-"Se \"True\" kaj instalitas GTK+ kaj PyGTK versioj almenaŭ 2.8, fari la "
-"fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
-"kiam estas atendantaj eventoj."
-
-#: ../src/common/config.py:207
-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 ne ŝatas SHA informon kiam iu konektas al pasvortprotekta "
-"babilejo. Valorigu tiun opcion per \"False\" por halti sendadon de SHA "
-"informon en babilejo."
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Administras fenestron kien novaj mesaĝoj metitas:\n"
-"'always' - ĉiuj mesaĝoj en unu fenestron;\n"
-"'never' - ĉiu mesaĝo en lian propran fenestron;\n"
-"'peracct' - mesaĝoj de ĉiu konto en apartan fenestron;\n"
-"'pertype' - ĉiu mesaĝtipo (ekzemple babileja aŭ dupersoninterparola) en "
-"apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
-"antaŭ la ŝanĝo efikos."
-
-#: ../src/common/config.py:211
-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:212
-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:213
-msgid "Hides the buttons in group chat window."
-msgstr "Kaŝas la butonojn en babileja fenestro."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Kaŝas la butonojn en dupersona interparola fenestro."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Kaŝas rubandon en babileja fenestro"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Kaŝas rubandon en dupersona interparola fenestro"
-
-#: ../src/common/config.py:217
-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:218
-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 ""
-"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:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
-
-#: ../src/common/config.py:220
-msgid "List of colors 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:221
-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:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-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:223
-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 ""
-"Se \"True\", vi povos valorigi prioritaton de via konto per negativaj "
-"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:224
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
-"pasvortojn."
-
-#: ../src/common/config.py:225
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
-"kontaj kaj grupaj linioj."
-
-#: ../src/common/config.py:226
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-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:237
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
-"agorderoj \"autopriority_*\"."
-
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 ĉirkaŭiro"
-
-#: ../src/common/config.py:270
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
-"file_transfer_proxies por dosiertransmeto."
-
-#: ../src/common/config.py:329
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
-
-#: ../src/common/config.py:330 ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
-
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr "'all' aŭ spacetseparitaj statoj"
-
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', aŭ 'both'"
-
-#: ../src/common/config.py:341 ../src/common/config.py:343
-#: ../src/common/config.py:344 ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' aŭ ''"
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Dormas"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Revenos baldaŭ"
-
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Revenos post kelkaj minutoj."
-
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Manĝas"
-
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Mi manĝas, do restigu mesaĝon por mi."
-
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Kino"
-
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Mi spektas filmon."
-
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Laboras"
-
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Mi laboras."
-
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Telefonado"
-
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Mi telefonas."
-
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Eliris"
-
-#: ../src/common/config.py:360
-msgid "I'm out enjoying life."
-msgstr "Mi eliris por amuziĝi."
-
-#: ../src/common/config.py:364
-msgid "I'm available."
-msgstr "Mi disponeblas."
-
-#: ../src/common/config.py:365
-msgid "I'm free for chat."
-msgstr "Mi babilemas."
-
-#: ../src/common/config.py:367
-msgid "I'm not available."
-msgstr "Mi ne disponeblas."
-
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Ne malhelpu."
-
-#: ../src/common/config.py:369 ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Ĝis!"
-
-#: ../src/common/config.py:379
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
-"muc_highlight_words, aŭ vian kaŝnomon."
-
-#: ../src/common/config.py:380
-msgid "Sound to play when any MUC message arrives."
-msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
-
-#: ../src/common/config.py:389 ../src/common/optparser.py:193
-msgid "green"
-msgstr "verda"
-
-#: ../src/common/config.py:393 ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "manĝbutiko"
-
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "homa"
-
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "mara"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Neeblas ŝargi senfaran modulon"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Malprava servilnomo"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"La servilnomo, specifita de vi en la agordero \"ft_override_host_to_send\" "
-"de la detala agordo, ne ekzistas aŭ malkorektas, tial estas ignorata."
 
-#: ../src/common/connection_handlers.py:590
-#, 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:1547
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kaŝnomo malpermesita: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1609
-#: ../src/common/connection_handlers.py:1612
-#: ../src/common/connection_handlers.py:1615
-#: ../src/common/connection_handlers.py:1618
-#: ../src/common/connection_handlers.py:1621
-#: ../src/common/connection_handlers.py:1624
-#: ../src/common/connection_handlers.py:1632
-msgid "Unable to join group chat"
-msgstr "Neeblas aliĝi al babilejo"
-
-#: ../src/common/connection_handlers.py:1610
-msgid "A password is required to join this group chat."
-msgstr "Necesas pasvorto por aliĝi al la babilejo."
-
-#: ../src/common/connection_handlers.py:1613
-msgid "You are banned from this group chat."
-msgstr "Al vi oni malpermesis esti en la babilejo."
-
-#: ../src/common/connection_handlers.py:1616
-msgid "Such group chat does not exist."
-msgstr "Tiu babilejo ne ekzistas."
-
-#: ../src/common/connection_handlers.py:1619
-msgid "Group chat creation is restricted."
-msgstr "Babileja kreado limigitas."
-
-#: ../src/common/connection_handlers.py:1622
-msgid "Your registered nickname must be used."
-msgstr "Vi devas uzi vian registritan kaŝnomon."
-
-#: ../src/common/connection_handlers.py:1625
-msgid "You are not in the members list."
-msgstr "Vi ne ĉeestas en membrolisto."
-
-#: ../src/common/connection_handlers.py:1633
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
-"Bonvolu specifi alian kaŝnomon jene:"
-
-#: ../src/common/connection_handlers.py:1683
-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:1704
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nun ni abonas %s"
-
-#: ../src/common/connection_handlers.py:1706
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "ordono pri abona fino de %s"
-
-#: ../src/common/connection_handlers.py:1708
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ni nun ne abonas pri %s"
-
-#: ../src/common/connection_handlers.py:1884
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. Uzu "
-"kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
-
-#: ../src/common/connection.py:182
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Konekto kun konto \"%s\" rompiĝis"
-
-#: ../src/common/connection.py:183
-msgid "Reconnect manually."
-msgstr "Rekonektu mane."
-
-#: ../src/common/connection.py:194 ../src/common/connection.py:221
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transportilo %s respondis malprave al registra peto: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:220
-msgid "Invalid answer"
-msgstr "Nekorekta respondo"
-
-#: ../src/common/connection.py:417 ../src/common/connection.py:516
-#: ../src/common/connection.py:974
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Ne povas konekti al \"%s\""
-
-#: ../src/common/connection.py:431
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Konektis al servilo %s:%s per %s"
-
-#: ../src/common/connection.py:445
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Etraro de sekureco dum konektado al \"%s\""
-
-#: ../src/common/connection.py:446
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr ""
-"La servila ŝlosilo estas ŝanĝita, aŭ iu provas rompmalfermi vian konekton."
-
-#: ../src/common/connection.py:453
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr "Neeblas kontroli fingrospuron por %s. Konekto estos nesekura."
-
-#: ../src/common/connection.py:495
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Mankas fingrospuro en SSL-konekto al %s"
-
-#: ../src/common/connection.py:501
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Fingrospura malkongruo por %s: ricevis %s, atendis %s"
-
-#: ../src/common/connection.py:517
-msgid "Check your connection or try again later"
-msgstr "Kontrolu vian konekton aŭ provu denove poste"
-
-#: ../src/common/connection.py:543
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
-
-#: ../src/common/connection.py:544
-msgid "Please check your login and password for correctness."
-msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
-
-#: ../src/common/connection.py:571
-msgid "Error while removing privacy list"
-msgstr "Eraro dum forigado de privata listo"
-
-#: ../src/common/connection.py:572
-#, 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 ""
-"Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
-"konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:670
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP-pasfrazo ne estis donita"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:712
-msgid "invisible"
-msgstr "nevidebla"
-
-#: ../src/common/connection.py:713
-msgid "offline"
-msgstr "senkonekta"
-
-#: ../src/common/connection.py:714
-#, python-format
-msgid "I'm %s"
-msgstr "Mi estas %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:805
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
-
-#: ../src/common/connection.py:861
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Temo: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1000
-msgid "Not fetched because of invisible status"
-msgstr "Ne obtenita pro nevidebla stato"
-
-#: ../src/common/contacts.py:271
-msgid "Not in roster"
-msgstr "Mankas en kontaktlisto"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ankaŭ konata kiel python-pysqlite2) mankas. Finas..."
-
-#: ../src/common/exceptions.py:30
-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:38
-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:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Seancbuso nedisponeblas.\n"
-"Provu legi http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "unu"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "du"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tri"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "kvar"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "kvin"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "ses"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "sep"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " risurco kun prioritato "
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "ok"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "naŭ"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "Nek %s publicis OpenPGP-ŝlosilon, nek vi enigis ĝin"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "dek"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Ne estas tiu komando: /%s (se vi volas sendi tion, metu /say antaŭen)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "dekunu"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s "
+#~ "eksplodas)."
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "dekdu"
+#~ msgid "Encryption enabled"
+#~ msgstr "Ĉifrado ebligata"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "la $0a horo"
+#~ msgid "Encryption disabled"
+#~ msgstr "Ĉifrado malebligata"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "kvin minutoj post la $0a"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Ripetu pasvorton:"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "dek minutoj post la $0a"
+#~ msgid "_Use proxy"
+#~ msgstr "_Uzi prokuran servilon"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvarono post la $0a"
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Se markita, ĉiuj lokaj kontaktoj kiuj uzas Bonjour-kapablajn "
+#~ "tujmesaĝilojn (kiel iChat, Trillian aŭ Gaim) estos montrata en "
+#~ "kontaktlisto. Vi ne bezonas konekton al jabber-servilo por ke tio "
+#~ "funkciu.\n"
+#~ "Ĉi tio eblas nur se estas instalita python-avahi kaj avahi-demono estas "
+#~ "lanĉita."
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dudek minutoj post la $0a"
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Se vi havas 2 aŭ plie kontojn kaj tio estas markita, Gajim montras ĉiujn "
+#~ "kontaktojn, kvazaŭ vi havas unu konton"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dudek kvin minutoj post la $0a"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "Ebligi _lig-lokan komunikadon"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "la $0a kaj duono"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dudek kvin minutoj antaŭ la $1a"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompakta vido    Alt+C"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dudek minutoj antaŭ la $1a"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klaku por vidi pasintan interparolon en tiu ĉi babilejo"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvarono antaŭ la $1a"
+#~ msgid "Build custom query"
+#~ msgstr "Konstrui propran informmendon"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "dek minutoj antaŭ la $1a"
+#~ msgid "Query Builder..."
+#~ msgstr "Konstruilo de petoj..."
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "kvin minutoj antaŭ la $1a"
+#~ msgid "Accept"
+#~ msgstr "Akcepti"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "la $1a horo"
+#~ msgid "Invitation Received"
+#~ msgstr "Invito estas ricevita"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Nokto"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Aranĝo de lineo</b>"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Frua mateno"
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Agordo de fasado</b>"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Mateno"
+#~ msgid "Also known as iChat style"
+#~ msgstr "Konata ankaŭ kiel stilo de iChat"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Preskaŭ tagmezo"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Ekzemplo: se vi havas ebligitan statmesaĝon por fora, Gajim ne demandos "
+#~ "vin por statmesaĝo kiam vi ŝanĝas vian staton al fora; ĝi uzos defaŭlton "
+#~ "kiu estas specifita ĉi tie"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Tagmezo"
+#~ msgid "Chat"
+#~ msgstr "Babilejo"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Posttagmezo"
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Determinatajn de sendanto\n"
+#~ "Interparolajn mesaĝojn\n"
+#~ "Unuopajn mesaĝojn"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Vespero"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Ĉiujn 5 _minutojn"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Malfrua vespero"
+#~ msgid "Events"
+#~ msgstr "Eventoj"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Komenco de semajno"
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Gajim aŭtomate montros novajn eventojn antaŭigante la adekvatan fenestron"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Mezo de semajno"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim avizos vin pri novaj eventoj per ŝprucfenestro en la malsupra "
+#~ "dekstra angulo de la ekrano"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Fino de semajno"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
+#~ "ekrano pri kontaktoj kiu ĵus ensalutis"
 
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Semajnofino!"
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim nur ŝanĝos la piktogramon de la kontakto, kiu okazigis novan eventon"
 
-#: ../src/common/helpers.py:114
-msgid "Invalid character in username."
-msgstr "Malkorekta signo en salutnomo."
+#~ 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 ""
+#~ "Se markitas, Gajim memoros la kontaktlistan kaj interparolajn fenestrajn "
+#~ "lokojn sur la ekrano kaj iliajn dimensiojn je sekva lanĉo."
 
-#: ../src/common/helpers.py:119
-msgid "Server address required."
-msgstr "Necesas adreso de servilo."
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Neniam\n"
+#~ "Ĉiam\n"
+#~ "Perkonte\n"
+#~ "Perspece"
 
-#: ../src/common/helpers.py:124
-msgid "Invalid character in hostname."
-msgstr "Malkorekta signo en servilnomo."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Eliraj babilstataj _avizoj:"
 
-#: ../src/common/helpers.py:130
-msgid "Invalid character in resource."
-msgstr "Malkorekta signo en risurcnomo."
+#~ msgid "Print time:"
+#~ msgstr "Eligi tempon:"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:170
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Konservi _lokon kaj grandecon de kontaktlista kaj interparola fenestroj"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:173
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Starigi statmesaĝon por reflekti kurantan ludantan _muzikaĵon"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:177
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "Show only in _roster"
+#~ msgstr "Montri nur en _kontaktlisto"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:180
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "The auto away status message"
+#~ msgstr "La aŭtomate fora statmesaĝo"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:184
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ msgid "The auto not available status message"
+#~ msgstr "La aŭtomate nedisponebla statmesaĝo"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:187
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Rigardi ĉiujn venantajn mesaĝojn kiel:"
 
-#. B means bytes
-#: ../src/common/helpers.py:190
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Uzi pletpiktogramon"
 
-#: ../src/common/helpers.py:219
-msgid "_Busy"
-msgstr "_Okupata"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Kiam nova evento (mesaĝo, peto pri dosiertransmeto ktp) estas ricevita, "
+#~ "la sekvaj metodoj eblos uzata por informi vin pri ĝi. Bonvolu rimarki ke "
+#~ "eventoj pri novaj mesaĝoj okazas nur se ĝi estas mesaĝo de kontakto kun "
+#~ "kiu vi ankoraŭ ne parolas"
 
-#: ../src/common/helpers.py:221
-msgid "Busy"
-msgstr "Okupata"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Funkcias por la ludiloj Rhythmbox kaj Muine. Por aliaj ludiloj, bonvolu "
+#~ "viziti http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../src/common/helpers.py:224
-msgid "_Not Available"
-msgstr "_Nedisponebla"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Kroma agordo de avizado..."
 
-#: ../src/common/helpers.py:229
-msgid "_Free for Chat"
-msgstr "_Babilema"
+#~ msgid "_Font:"
+#~ msgstr "_Tiparo:"
 
-#: ../src/common/helpers.py:231
-msgid "Free for Chat"
-msgstr "Babilema"
+#~ msgid "_Never"
+#~ msgstr "_Neniam"
 
-#: ../src/common/helpers.py:234
-msgid "_Available"
-msgstr "_Enrete"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Avizi min pri tio"
 
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Enrete"
+#~ msgid "_Player:"
+#~ msgstr "_Ludilo:"
 
-#: ../src/common/helpers.py:238
-msgid "Connecting"
-msgstr "Konektas"
+#~ msgid "_Pop it up"
+#~ msgstr "_Antaŭigi la fenestron"
 
-#: ../src/common/helpers.py:241
-msgid "A_way"
-msgstr "_Fora"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/helpers.py:246
-msgid "_Offline"
-msgstr "_Senkonekta"
+#~ msgid "Address"
+#~ msgstr "Adreso"
 
-#: ../src/common/helpers.py:248
-msgid "Offline"
-msgstr "Senkonekta"
+#~ msgid "City:"
+#~ msgstr "Urbo:"
 
-#: ../src/common/helpers.py:251
-msgid "_Invisible"
-msgstr "Ne_videbla"
+#~ msgid "Company:"
+#~ msgstr "Kompanio:"
 
-#: ../src/common/helpers.py:257
-msgid "?contact has status:Unknown"
-msgstr "Nekonata"
+#~ msgid "Given:"
+#~ msgstr "Nomo:"
 
-#: ../src/common/helpers.py:259
-msgid "?contact has status:Has errors"
-msgstr "Eraroj"
+#~ msgid "Middle:"
+#~ msgstr "Meznomo:"
 
-#: ../src/common/helpers.py:264
-msgid "?Subscription we already have:None"
-msgstr "Neniu"
+#~ msgid "Position:"
+#~ msgstr "Ofico:"
 
-#: ../src/common/helpers.py:266
-msgid "To"
-msgstr "Al"
+#~ msgid "Prefix:"
+#~ msgstr "Prefikso:"
 
-#: ../src/common/helpers.py:268
-msgid "From"
-msgstr "De"
+#~ msgid "Role:"
+#~ msgstr "Rolo:"
 
-#: ../src/common/helpers.py:270
-msgid "Both"
-msgstr "Ambaŭ"
+#~ msgid "State:"
+#~ msgstr "Ŝtato:"
 
-#: ../src/common/helpers.py:278
-msgid "?Ask (for Subscription):None"
-msgstr "Nenion"
+#~ msgid "Suffix:"
+#~ msgstr "Sufikso:"
 
-#: ../src/common/helpers.py:280
-msgid "Subscribe"
-msgstr "Aboni"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Forigi el kontaktlisto"
 
-#: ../src/common/helpers.py:289
-msgid "?Group Chat Contact Role:None"
-msgstr "Neniu"
+#~ msgid "A_ccounts"
+#~ msgstr "K_ontoj"
 
-#: ../src/common/helpers.py:292
-msgid "Moderators"
-msgstr "Moderigantoj"
+#~ msgid "_Filter:"
+#~ msgstr "_Filtrilo:"
 
-#: ../src/common/helpers.py:294
-msgid "Moderator"
-msgstr "Moderiganto"
+#~ msgid "Ask:"
+#~ msgstr "Demandas:"
 
-#: ../src/common/helpers.py:297
-msgid "Participants"
-msgstr "Partoprenantoj"
+#~ msgid "Client:"
+#~ msgstr "Kliento:"
 
-#: ../src/common/helpers.py:299
-msgid "Participant"
-msgstr "Partoprenanto"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/helpers.py:302
-msgid "Visitors"
-msgstr "Vizitantoj"
+#~ msgid "Subscription:"
+#~ msgstr "Abono:"
 
-#: ../src/common/helpers.py:304
-msgid "Visitor"
-msgstr "Vizitanto"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Se tiu lingvo ne estas por kiu vi volas emfazi mistajpojn, do bonvolu "
+#~ "plenigi variablon $LANG per bezona valoro. Ekzemple por Esperanto: "
+#~ "LANG=eo_EO aŭ export LANG=eo_EO.UTF-8 en ~/.bash_profile aŭ se, vi volas "
+#~ "fari tion malloke, en /etc/profile.\n"
+#~ "\n"
+#~ "Emfazado de mistajpoj ne funkcios"
 
-#: ../src/common/helpers.py:310
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Neniu"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Ĉiujn %s _minutojn"
 
-#: ../src/common/helpers.py:312
-msgid "Owner"
-msgstr "Mastro"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Vi devas enigi pasvorton por la nova konto."
 
-#: ../src/common/helpers.py:314
-msgid "Administrator"
-msgstr "Administristo"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Vi ĉiam vidos ŝin aŭ lin senkonekta."
 
-#: ../src/common/helpers.py:316
-msgid "Member"
-msgstr "Membro"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s nun estas %s (%s)"
 
-#: ../src/common/helpers.py:355
-msgid "is paying attention to the conversation"
-msgstr "atentas al la komunikado"
+#~ msgid "%s is now %s"
+#~ msgstr "%s nun estas %s"
 
-#: ../src/common/helpers.py:357
-msgid "is doing something else"
-msgstr "faras ion alian"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "De: %(from_address)s"
 
-#: ../src/common/helpers.py:359
-msgid "is composing a message..."
-msgstr "tajpas mesaĝon..."
+#~ msgid "Network Manager support not available"
+#~ msgstr "Subteno de retadministrilo mankas"
 
-#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
-msgid "paused composing a message"
-msgstr "paŭzas tajpi mesaĝon"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
 
-#: ../src/common/helpers.py:364
-msgid "has closed the chat window or tab"
-msgstr "fermis la interparolan fenestron aŭ slipon"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uzado: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:890
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] " %d nelegita mesaĝo"
-msgstr[1] " %d nelegitaj mesaĝoj"
+#~ msgid "Private Chat"
+#~ msgstr "Privata interparolo"
 
-#: ../src/common/helpers.py:896
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] " %d nelegita unuopa mesaĝo"
-msgstr[1] " %d nelegitaj unuopaj mesaĝoj"
+#~ msgid "Group Chat"
+#~ msgstr "Babilejo"
 
-#: ../src/common/helpers.py:902
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] " %d nelegita babileja mesaĝo"
-msgstr[1] " %d nelegitaj babilejaj mesaĝoj"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "Tio ne estas valida JID: %s"
 
-#: ../src/common/helpers.py:908
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] " %d nelegita privata mesaĝo"
-msgstr[1] "%d nelegitaj privataj mesaĝoj"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "_New group chat"
+#~ msgstr "_Nova babilejo"
 
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "eraro: %s nedisponeblas por legi"
+#~ msgid "_Log on"
+#~ msgstr "E_nsaluti"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "Log _off"
+#~ msgstr "E_lsaluti"
 
-#: ../src/common/optparser.py:188 ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "blua"
+#~ msgid "Save passphrase"
+#~ msgstr "Konservi pasfrazon"
 
-#: ../src/common/optparser.py:306
-msgid "migrating logs database to indices"
-msgstr "indeksigas protokolan datumbazon"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Movi %s en la grupon %s"
 
-#: ../src/common/passwords.py:82
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim-konto %s"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Igi %s kaj %s metakontaktoj"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr "Konekto kun retnodo masukcesis: Nekorekta respondo de servilo."
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Kaŝas la butonojn en dupersona interparola fenestro."
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Konekto kun retnodo neestableblas."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Konektis al servilo %s:%s per %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Etraro de sekureco dum konektado al \"%s\""
 
-#: ../src/common/zeroconf/client_zeroconf.py:627
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "La servila ŝlosilo estas ŝanĝita, aŭ iu provas rompmalfermi vian konekton."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr "Neeblas kontroli fingrospuron por %s. Konekto estos nesekura."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Eraro de Avahi"
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Mankas fingrospuro en SSL-konekto al %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Lig-loka komunikado ne povas funkcii korekte."
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Fingrospura malkongruo por %s: ricevis %s, atendis %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Bonvolu certiĝi ke Avahi estas instalita."
+#~ msgid "invisible"
+#~ msgstr "nevidebla"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Ne povas lanĉi lokan servon"
+#~ msgid "offline"
+#~ msgstr "senkonekta"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Neeblas aliĝi al pordo %d."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] " %d nelegita unuopa mesaĝo"
+#~ msgstr[1] " %d nelegitaj unuopaj mesaĝoj"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] " %d nelegita babileja mesaĝo"
+#~ msgstr[1] " %d nelegitaj babilejaj mesaĝoj"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Ne povas ŝanĝi staton de konto \"%s\""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] " %d nelegita privata mesaĝo"
+#~ msgstr[1] "%d nelegitaj privataj mesaĝoj"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr "Konekto kun retnodo masukcesis: Nekorekta respondo de servilo."
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "eraro dum aldonado de servo %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Konekto kun retnodo neestableblas."
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "Post kaŝnomo:"
@@ -6726,9 +9987,6 @@ msgstr "eraro dum aldonado de servo %s"
 #~ msgid "_Before time:"
 #~ msgstr "_Antaŭ tempo:"
 
-#~ msgid "_Publish"
-#~ msgstr "_Publici"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Reobteni"
 
@@ -6795,9 +10053,6 @@ msgstr "eraro dum aldonado de servo %s"
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Nekonata versio de D-BUS: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "Vizitkarto estas sukcese publicita"
 
@@ -6813,9 +10068,6 @@ msgstr "eraro dum aldonado de servo %s"
 #~ msgid "Since %s"
 #~ msgstr "Ekde %s"
 
-#~ msgid "Personal details"
-#~ msgstr "Persona detalaĵoj"
-
 #~ msgid ""
 #~ "Exit the already running Gajim, or delete pid file:\n"
 #~ " \"%s\".\n"
@@ -6833,6 +10085,3 @@ msgstr "eraro dum aldonado de servo %s"
 
 #~ msgid "Send File"
 #~ msgstr "Sendi dosieron"
-
-#~ msgid "Underline"
-#~ msgstr "Substreko"
diff --git a/po/es.po b/po/es.po
index a577afb9f..dfe16da92 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,13 +3,12 @@
 # Copyright (C) 2004 THE gajim'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gajim package.
 # Automatically generated, 2004.
-# 
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -31,44 +30,52 @@ msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Enviar mensaje..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Descubrir servicios..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupos de charla"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Modificar cuenta"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modificar cuenta..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir bandeja de entrada de GMail"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Información personal"
+
 #: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "Iniciar conversació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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -81,121 +88,143 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
-msgstr "<b>Por favor, introduce los datos para tu nueva cuenta</b>"
+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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Click para ver características (como transportes de MSN e ICQ) de los "
 "servidores de Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Conectar cuando presione Finalizar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para crear una cuenta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 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:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "_Contraseña: "
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Gestionar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Características de los servidores"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Definir mi perfil cuando me conecte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Usar nombre de host y puerto personalizados"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr "Debes tener una cuenta antes de conectar a la red Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Tu JID"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Servidor"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Nombre del host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Reintroduce la contraseña:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Usar proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Nombre"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 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/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información personal</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Cuenta"
 
@@ -204,19 +233,29 @@ msgid "Account Modification"
 msgstr "Modificar cuenta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Autoreconectar si se pierde la conexión"
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Lista de administradores"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Autoreconectar si se pierde la conexión"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Cam_biar contraseña"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -227,44 +266,61 @@ msgstr ""
 "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"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Elegir _clave..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Click para cambiar la contraseña de la cuenta"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "_Editar información personal personales..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "General"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nombre del host:"
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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."
@@ -272,15 +328,17 @@ 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:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
 "Si está marcado, Gajim enviará paquetes de mantenimiento de actividad para "
 "prevenir que expire la conexión"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -289,7 +347,8 @@ 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:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -298,7 +357,8 @@ msgstr ""
 "Si está marcado, Gajim, cuando se inicie, conectará automáticamente a Jabber "
 "usando esta cuenta."
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -309,44 +369,49 @@ 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:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Gestionar..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ninguno"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Puerto: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Pr_ioridad:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -356,19 +421,23 @@ 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:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 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:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+#, fuzzy
+msgid "Resour_ce:"
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -383,91 +452,160 @@ 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:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar contraseña (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 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:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Mostrar contactos desconectados"
+
+#: ../data/glade/account_modification_window.glade.h:44
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (el viejo)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Usar nombre de host y puerto personalizados"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para las transferencias de archivo"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Ajustar al estado"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "_Nombre: "
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Registro</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Si está marcado, todos los contactos locales que usen un cliente Bonjour "
-"compatible (como iChat, Trillian o Gaim) se mostrarán en el roster. No "
-"necesitas estar conectado a un servidor jabber para su funcionamiento,\n"
-"Esto sólamente está disponible si python-avahi está instalado y avahi-daemon "
-"se encuentra en ejecución."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Correo-e:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activar"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Nombre:"
+
+#: ../data/glade/accounts_window.glade.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
+
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 tienes dos o más cuentas y está marcado, Gajim listará todos los "
-"contactos de forma mixta"
+"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:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "ID de Jabber:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Apellido(s):"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Combinar las cuentas"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "Habilitar m_ensajería de enlace local"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Re_nombrar"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Modificar"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Eliminar"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Usar puerto personalizado:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -486,8 +624,9 @@ 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
+#, fuzzy
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -526,7 +665,8 @@ msgid "_User ID:"
 msgstr "ID de _usuario:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
-msgid "<b>An error has occured:</b>"
+#, fuzzy
+msgid "<b>An error has occurred:</b>"
 msgstr "<b>Ha ocurrido un error:</b>"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -562,11 +702,13 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Descripción</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+#, fuzzy
+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"
 
@@ -587,45 +729,46 @@ msgid "Deletes Message of the Day"
 msgstr "Elimiina mensaje del día"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "Envía un mensaje a los usuarios conectados en este momento al servidor"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Listas de _privacidad"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Definir MOTD"
+#, fuzzy
+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
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Definir MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Mostrar consola _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Actualizar MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Actualiza el mensaje del día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "Listas de _privacidad"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Enviar mensaje de servidor"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Enviar mensaje"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " una ventana/pestaña abierta con ese contacto "
@@ -639,7 +782,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condiciones</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonidos</b>"
 
@@ -656,7 +799,7 @@ msgid "All statuses"
 msgstr "Todos los estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Ausente"
 
@@ -673,7 +816,7 @@ msgid "Have "
 msgstr "Tiene "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -682,7 +825,7 @@ msgid "Launch a command"
 msgstr "Lanzar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -699,16 +842,16 @@ msgid "Play a sound"
 msgstr "Reproducir un _sonido"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
+#, fuzzy
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 "Recibir un mensaje\n"
 "Contacto conectado \n"
@@ -720,58 +863,58 @@ msgstr ""
 "Transferencia iniciada \n"
 "Transferencia finalizada"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr "Cuando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.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:29
+#: ../data/glade/advanced_notifications_window.glade.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:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr "_Deshabilitar ventanas emergentes existentes"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Deshabilitar sonidos existentes para este evento"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Deshabilitar mostar eventos en el roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Deshabilitar mostrar eventos en el systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informarme con una ventana emergente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Open chat window with user"
 msgstr "_Abrir ventana de conversación con este usuario"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Show event in roster"
 msgstr "_Mostrar evento en roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
 msgstr "_Mostrar evento en systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr "y yo "
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -781,50 +924,62 @@ msgstr ""
 "grupo(s)\n"
 "todo el mundo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 msgid "for "
 msgstr "para "
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr "cuando esté en"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Romeo y Julieta</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Entrada:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Nombre del feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Nueva entrada recibida"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Historias viejas"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Soliloquio"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Has recibido una nueva entrada:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Contactos"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Mensajes de estado predefinidos</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Registro</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Registro</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Cambiar contraseña"
@@ -854,10 +1009,9 @@ msgid "Join _Group Chat"
 msgstr "Entrar a un grupo de charla"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Añadir a la lista de contactos"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -877,39 +1031,70 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../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/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Click para ver anteriores conversaciones con este contacto"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Contactos"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar archivo"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Alternar encriptación OpenPGP"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar encriptación OpenPGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "Vista _compacta    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Añadir a la lista de contactos"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Histórico"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "In_vitar a"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observadores"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Rellenar el formulario."
@@ -922,6 +1107,24 @@ msgstr "Configuración del salón"
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descripción</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Características de los servidores"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Una lista de transferencias activas, finalizadas y detenidas"
@@ -957,12 +1160,14 @@ msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias de la lista"
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, fuzzy
+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
-msgid "Shows a list of file transfers between you and other"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
 msgstr "Muestra una lista de transferencias entre tú y otro"
 
 #: ../data/glade/filetransfers.glade.h:11
@@ -978,7 +1183,7 @@ 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:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -986,7 +1191,7 @@ msgstr "_Continuar"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
@@ -1034,7 +1239,7 @@ msgstr "Personalización de temas de Gajim"
 msgid "Gone"
 msgstr "Me fui"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inactivo"
 
@@ -1075,58 +1280,72 @@ msgid "_Background:"
 msgstr "_Fondo"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Cambiar _Alias"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Cambiar el _tema"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Click para ver anteriores conversaciones en este salón"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Configurar el salón"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Configurar el salón"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Añadir este salón a marcadores"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Añadir este salón a marcadores"
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Gestionar marcadores"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Acciones"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Miembro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Acciones"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1134,22 +1353,19 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear nuevo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Tema"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1164,82 +1380,87 @@ msgstr ""
 "contactos con los que te\n"
 "encuentres hablando en este momento."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gestor de Histórico de Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gestor de Histórico de Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Buscar en la base de datos"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Construir consulta personalizada"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Histórico de conversaciones"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Constructor de consultas..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Buscar"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Buscar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Denegar"
+#, fuzzy
+msgid "Search:"
+msgstr "Buscar"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Invitación recibida"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "Histórico de conversaciones"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Alias:"
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "Definir mi perfil cuando me conecte"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "Alias:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Recientemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1259,18 +1480,37 @@ msgstr "Si está marcado, Gajim entrará a este salón al inicio"
 msgid "Manage Bookmarks"
 msgstr "Gestionar marcadores"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Mostrar estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Título:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Configuración del salón"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Propiedades</b>"
@@ -1280,46 +1520,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Configuración</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Conectar con HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Nombre:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Contraseña: "
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Usar autentificación"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Servidor"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Haz click para insertar un emoticono (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Añade contacto al roster"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "Encriptación OpenPGP"
+#: ../data/glade/message_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Añadir este salón a marcadores"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Acciones"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar _Alias"
 
-#. 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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está prestando atención a la conversación"
+
+#: ../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 "Haz click para insertar un emoticono (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1335,40 +1614,77 @@ msgstr "<b>Editor de configuración avanzada</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Programas</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Acciones</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Personalizado</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Editar una regla</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Formato del renglón</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Colores de la pestaña para los estados de conversación</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opciones de GMail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificationes Visuales</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Personalización de la interfaz</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Registro</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opciones de GMail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Lista de privacidad</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensajes de estado predefinidos</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Propiedades</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificationes Visuales</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
-msgid "A_fter nickname:"
-msgstr "Después del alias:"
-
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanzado"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1378,48 +1694,27 @@ msgstr ""
 "Sólo componiendo\n"
 "Desactivado"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Permitir envío de información sobre el sistema operativo"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:25
 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:19
-msgid "Also known as iChat style"
-msgstr "También conocido como estilo iChat"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Un ejemplo: Si tienes activado el mensaje de estado para ausente, Gajim no "
-"te preguntará más por un mensaje de estado cuando cambies tu estado a "
-"ausente; simplemente aplicará el mensaje predefinido para ausente"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Poner _ausente después de:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Poner _no disponible después de:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Autodetectar en cada inicio de Gajim\n"
@@ -1428,65 +1723,56 @@ msgstr ""
 "Siempre usar las aplicaciones por defecto de XFCE4\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "B_efore nickname:"
-msgstr "Ant_es del alias:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Charla"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "Men_saje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"Marca esta opción sólo si alguien que no tienes en el roster te molesta. "
-"Ú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:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "Configurar colores y fuentes de la interfaz"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "Mensajes de estado por defecto"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:34
-msgid "Default status _iconset:"
-msgstr "Set de _iconos de estado por defecto:"
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Mostrar en el roster los a_vatares de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "Mostrar detalles _extra en los correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Mostrar en el roster los a_vatares de los contactos"
+
+#: ../data/glade/preferences_window.glade.h:43
 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:37
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Mostrar en el roster los a_vatares de los contactos"
+
+#: ../data/glade/preferences_window.glade.h:45
 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:38
-msgid "Displayed Chat state noti_fications:"
-msgstr "Notificaciones de estado en las conversaciones:"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "E_very 5 minutes"
-msgstr "Cada 5 _minutos"
-
-#: ../data/glade/preferences_window.glade.h:40
-msgid "Emoticons:"
-msgstr "Emoticonos:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Eventos"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1496,7 +1782,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:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1506,29 +1792,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:44
-msgid ""
-"Gajim will automatically show new events by poping up the relative window"
-msgstr ""
-"Gajim mostrará automáticamente nuevos eventos emergiendo la ventana relativa"
-
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim te notificará de nuevos eventos a través de un mensaje emergente en la "
-"esquina inferior derecha de la pantalla"
-
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
-"pantalla cuando un contacto se conecte"
-
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1536,12 +1800,19 @@ 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:48
+#: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Oculta los botones en las ventanas de grupo de charla."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim sólo mostrará el icono del contacto que provocó el nuevo evento"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Si está marcado, Gajim entrará a este salón al inicio"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1549,7 +1820,21 @@ msgstr ""
 "Si está marcado, Gajim también incluirá información acerca del remitente de "
 "nuevos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Si está marcado, Gajim alojará un icono en el área de notificación del "
+"sistema"
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1557,7 +1842,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:52
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1565,107 +1850,149 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Si está marcado, Gajim recordará la posición del roster y ventanas de "
-"conversación en la pantalla y sus tamaños para la próxima vez que aparezcan"
+"Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
+"grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Si está marcado, Gajim usará iconos específicos para el protocolo- (p. ej. "
-"un contacto de MSN tendrá el icono de msn equivalente para su estado en "
-"línea, ausente, ocupado, etc...)"
+"Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
+"grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 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:56
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorar contenido enriquecido en mensajes entrantes"
+"Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
+"grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:57
-msgid "Ma_nage..."
-msgstr "Gestio_nar..."
+#: ../data/glade/preferences_window.glade.h:60
+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:58
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Nunca\n"
-"Siempre\n"
-"Por cuenta\n"
-"Por tipo"
+"Marca esta opción sólo si alguien que no tienes en el roster te molesta. "
+"Úsalo con precaución ya que bloqueará todos los mensajes de cualquier "
+"contacto que no esté en tu lista de contactos."
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "Notificar cuand un contacto: "
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "Notify on new _GMail email"
-msgstr "Notificar de nuevos correos de _GMail"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Si está marcado, Gajim también incluirá información acerca del remitente de "
+"nuevos correos electrónicos"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "En cada _mensaje"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Si está marcado, Gajim usará iconos específicos para el protocolo- (p. ej. "
+"un contacto de MSN tendrá el icono de msn equivalente para su estado en "
+"línea, ausente, ocupado, etc...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "One message _window:"
-msgstr "Una sóla ventana de conversación"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Notificaciones salientes del estado de conversación:"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Si no está deshabilitado, Gajim reemplazará emoticonos ascii ':)' por su "
+"equivalente en iconos gráficos estáticos o animados"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Play _sounds"
-msgstr "Reproducir _sonidos"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "Preferencias"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Una sóla ventana de conversación"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Insertar la hora:"
+msgid "Ma_nage..."
+msgstr "Gestio_nar..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr ""
-"Guarda _posición y tamaño para las ventanas de conversaciones y lista de "
-"contactos"
+#, fuzzy
+msgid "Notifications"
+msgstr "Modificar cuenta"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Cambiar el mensaje de estado para reflejar la pista_musical en curso"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar cuand un contacto: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Sólo mostrar en la _lista de contactos"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar cuand un contacto: "
 
 #: ../data/glade/preferences_window.glade.h:73
+msgid "Notify on new _GMail email"
+msgstr "Notificar de nuevos correos de _GMail"
+
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Información personal"
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "Reproducir _sonidos"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1673,143 +2000,148 @@ 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:76
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Ordenar contacto_s por estado"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:85
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Set de _iconos de estado por defecto:"
+
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "Atascado"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "El mensaje de estado de auto-ausencia"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "El mensaje de estado de no auto-no disponible"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr "_Usar los iconos del transporte"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Usar pre_definido del sistema"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Usar icono en el á_rea de notificación"
-
-#: ../data/glade/preferences_window.glade.h:83
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Cuando se recibe un nuevo evento (mensaje, envío de archivos, etc...), "
-"pueden ser usados los siguientes métodos para informar. Observa que los "
-"eventos de nuevos mensajes sólo ocurren si proceden de un contacto con el "
-"que no estabas ya conversando"
-
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "When new event is received:"
 msgstr "Cuando se reciba un nuevo evento"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"Funciona para los reproductores Rythmbox and Muine. Para más reproductores, "
-"visita http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid "_Advanced Notifications Control..."
-msgstr "Control de notificaciones _avanzadas..."
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "_After time:"
-msgstr "_Después de la hora:"
-
-#: ../data/glade/preferences_window.glade.h:88
-msgid "_Before time:"
-msgstr "_Antes de la hora"
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "Poner _ausente después de:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:95
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Notificaciones de estado en las conversaciones:"
+
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticonos:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "A_dministrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:91
-msgid "_Font:"
-msgstr "_Fuente:"
-
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:99
 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:94
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorar contenido enriquecido en mensajes entrantes"
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Mens_aje entrante:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Nunca"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Notificarme"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Poner _no disponible después de:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "_Reproductor:"
-
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "_Emerger"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "_Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:104
-msgid "_Sort contacts by status"
-msgstr "Ordenar contacto_s por estado"
+#: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Notificaciones de estado en las conversaciones:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "Men_saje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Entrar a un grupo de charla"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "no está en el roster"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutos"
 
@@ -1845,6 +2177,10 @@ msgstr "Todos"
 msgid "Allow"
 msgstr "Permitir"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Denegar"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "ID de Jabber:"
@@ -1853,7 +2189,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orden:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
@@ -1893,152 +2229,180 @@ msgstr "para enviarme el estado"
 msgid "to view my status"
 msgstr "para ver mi estado"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Añadir una regla</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Acerca de"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Dirección"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Cumpleaños:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ../data/glade/vcard_information_window.glade.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:6
-msgid "Birthday:"
-msgstr "Cumpleaños:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Ciudad:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Sonidos</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Compañía:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "País:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "Correo-e:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Segunda dirección:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Familia:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Personalizado</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Nombre de pila:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Página web:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Añadir una regla</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Personalizado</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Alias:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Medio:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Teléfono:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Más"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condiciones</b>"
+
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, 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:31
-msgid "Personal Info"
-msgstr "Información personal"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Propiedades</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Registro</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Teléfono:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, 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
-msgid "Position:"
-msgstr "Posición:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Código postal:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Configuración</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Prefijo"
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sonidos</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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Puesto:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Acerca de"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Estado:"
+msgid "Click to set your avatar"
+msgstr "Click para definir tu avatar"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Calle:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Sufijo:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Información personal"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Recuperar"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>¿Qué quieres hacer?</b>"
@@ -2051,78 +2415,128 @@ msgstr "Eliminar la _cuenta únicamente de Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Eliminar"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Pregunta para ver _su estado"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Añadir _notificación especial"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Asignar clave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Editar grupos"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_vitar a"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaje"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Eliminar"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Envía XML personalizado"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Enviar mensaje..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Enviar archivo"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Eliminar del Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Renombrar contacto"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "Renombrar"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Subscripción"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "nueve"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Cuentas"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Añadir contacto..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Añadir un _Contacto"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Características de los servidores"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2136,51 +2550,91 @@ msgstr "Preguntas frecuentes (en línea)"
 msgid "Help online"
 msgstr "Ayuda online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Mostrar _roster"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Contenidos"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Cuentas"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Descubrir servicios"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Acciones"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Contenidos"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Enviar mensaje..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Ver"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Por favor, espera mientras se solicita la lista de comandos..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Buscar"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Añadir un _Contacto"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Información"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Buscar"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "I_r"
@@ -2189,10 +2643,6 @@ msgstr "I_r"
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtro:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registrar en"
@@ -2250,11 +2700,15 @@ msgid "Au_thorize"
 msgstr "Au_torizar"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, fuzzy
+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
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, fuzzy
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr ""
 "Denegar autorización de contacto para que no pueda saber cuándo estás "
 "conectado"
@@ -2267,10 +2721,31 @@ msgstr "Petición de adición"
 msgid "_Deny"
 msgstr "_Denegar"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID del contacto con el que quieres conversar"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
@@ -2283,57 +2758,73 @@ msgstr "Mostrar _roster"
 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:5
-msgid "Ask:"
-msgstr "Pregunta:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Acciones</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Cliente:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "ID de Jabber:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Recurso:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Configuración</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descripción</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Personalizado</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Configurar el salón"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "SO:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Recurso:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Estado:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Subscripción:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Más"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "Histórico de conversaciones"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Elegir avatar"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2343,11 +2834,6 @@ msgstr "<b>Tráfico de Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2366,15 +2852,29 @@ msgstr "_Mensaje"
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Nombre:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Añadir _notificación especial"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Apellido(s):"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Asignar clave OpenPGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Editar grupos"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "Renombrar"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Modificar cuenta..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2384,212 +2884,419 @@ msgstr "JID local"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Recurso:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Estado:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Usar puerto personalizado:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Información"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
 
-#: ../src/advanced.py:57
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "Activo"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "Inactivo"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "En el grupo"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr "Texto"
+
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
+
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nombre de la opción"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Oculta"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Belarusian"
+msgstr "Búlgaro"
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Británico"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Griego"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "British"
+msgstr "Británico"
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Euskera"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian (b)"
 msgstr "Noruego b"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Alemán"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Si este no es el idioma para el quieres resaltar las palabras mal escritas "
-"debes definir la variable $LANG con el valor apropiado. P. ej, para el "
-"Francés haz export LANG=fr_FR o export LANG=fr_FR.UTF-8 en ~/.bash_profile o "
-"hazlo globalmente en /etc/profile.\n"
-"\n"
-"El resalto de palabras mal escritas no será usado"
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:844
-msgid "Chats"
-msgstr "Charlas"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Encriptación activada"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "no está en el roster"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "tipo no conocido %s "
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#, fuzzy
+msgid "Unknown Title"
+msgstr "tipo no conocido %s "
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#, fuzzy
+msgid "Unknown Source"
+msgstr "tipo no conocido %s "
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" por %(artist)s"
 
-#: ../src/chat_control.py:1030
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Encriptación desactivada"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Usar autentificación"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Usar autentificación"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s no ha difundido su clave OpenPGP ni tú le has asignado una"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "Encriptación activada"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Comandos: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Uso: /%s, limpia de texto la ventana."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Uso: /%s, oculta los botones de conversación."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Uso: /%s <acción>, envía una acción al grupo de charla actual. Usa la "
+"tercera persona. (p.ej. /%s grita.)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Uso: /%s, cambia la ventana de salón a modo compacto."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Uso: /%s, oculta los botones de conversación."
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "No hay información de ayuda para /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Este mensaje está encriptado]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Encriptación desactivada"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "no está en el roster"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Este mensaje está encriptado]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Este mensaje está encriptado]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1545
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2597,29 +3304,2621 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s está ahora %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "creando base de datos de registros"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, 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:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim se cerrará ahora"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, 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:152
+#, python-format
+msgid "creating %s directory"
+msgstr "creando directorio %s"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Información"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Contacto cambió su estado"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Libre para hablar"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "nueve"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+#, fuzzy
+msgid "Do not disturb"
+msgstr "No molestar."
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Descripción del error..."
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Nuevo grupo de charla"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s del salón %(room_name)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "%s ha entrado en el grupo de charla"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Grupos de charla"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Ya estás en el salón %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d mensaje sin leer"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tiempo en minutos, después de haber cambiado a ausente"
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Ausente por inactividad"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "No disponible por inactividad"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+# duda sobre collapsed
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Por defecto"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Habilitar mensajería de enlace local / zeroconf"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Lenguaje usado por el corrector"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'siempre' - muestra la hora en cada mensaje.\n"
+"'a veces' - muestra la hora cada print_ichat_every_foo_minutes minutos.\n"
+"'nunca' - nunca muestra la hora."
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
+"* *"
+
+#: ../src/common/config.py:128
+#, fuzzy
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Usa la sintaxis ReStructured para HTML, mas el formateo ascii si está "
+"seleccionado. (Si quieres usarlo, instala docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Carácter a añadir tras el alias cuando se usa completado de alias (tab) en "
+"los grupos de charla."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Carácter a proponer para añadir tras el alias deseado cuando el alias "
+"deseado está siendo usado por alguien en el grupo de charla."
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "¿Añadir * y [n] en el título del roster?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
+"una pestaña/ventana de conversación"
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Cuántos minutos debe durar la última línea de la conversación anterior."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
+"del cliente Mirabilis ICQ)"
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
+"significa usar wiktionary"
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Si es True, escucha las señales D-Bus de NetworkManager y los cambios del "
+"estado de las cuentas (con tal de que no tengan listen_to_network_manager "
+"puesto en False y sincronicen con el estado global) basados en el estado de "
+"la conexión de la red."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Las notificaciones de estado mostradas en las ventanas de conversación. "
+"Pueden ser all, composing_only o disabled."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Cuando no se muestra la hora en cada mensaje (print_time==sometimes), la "
+"muestra cada x minutos."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Preguntar siempre antes de cerrar la ventana/pestaña de un grupo de charla "
+"en esta lista (separada por espacios) de ID de Jabber de grupos de charla."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nunca preguntar antes de cerrar la ventana/pestaña de un grupo de "
+"conversación en esta lista (separada por espacios) de ID de Jabber de grupos "
+"de charla."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Se elimina el host que enviamos para la transferencia de un archivo en caso "
+"de traducción de la dirección o redirección de puertos."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Notifica eventos en el área de notificación."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Mostrar borde pestañeado de bloc en las ventanas de conversación?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "¿Mostrar botón de cerrar en la pestaña?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Noti_ficaciones del estado del chat"
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
+"de charla."
+
+#: ../src/common/config.py:219
+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 ""
+"Si es True, cierra Gajim cuando el botón X del gestor de ventanas es "
+"pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
+"notificación. "
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
+"sin leer. Dependiendo del tema, este icono puede ser animado."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"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:229
+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 ""
+"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:230
+#, fuzzy
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"puede ser \"none\", \"all\" o \"in_and_out\". Si es \"none\", Gajim no "
+"volverá a mostar la línea de estado en los grupos de charla cuando un "
+"miembro cambie su mensaje de estado. Si es \"all\" Gajim mostrará todos los "
+"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:232
+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:233
+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:235
+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:236
+msgid "Don't show avatar for the transport itself."
+msgstr "No mostrar avatar para el transporte en sí mismo"
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "No mostrar roster en la barra de tareas."
+
+#: ../src/common/config.py:238
+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 ""
+"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:240
+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 ""
+"A Jabberd1.4 no le gusta la información sha cuando se entra en un grupo de "
+"conversación protegido por contraseña. Cambia esta opción a False para para "
+"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:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Controla la ventana donde se depositan los nuevos mensajes.\n"
+"'always' - Todos los mensajes son enviados a una ventana única.'never' - "
+"Todos los mensajes obtienen su propia ventana.'peracct' - Los mensajes para "
+"cada cuenta son enviados a una ventana específica.\n"
+"'pertype' - Cada tipo de mensaje (p.ej., conversaciones vs. grupos de "
+"charla) es enviado a una ventana específica. Nota: cambiar esta opción "
+"requiere reiniciar Gajim para que los cambios tengan efecto."
+
+#: ../src/common/config.py:244
+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:245
+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:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Oculta los botones en las ventanas de grupo de charla."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Oculta el banner en una ventana de grupo de charla"
+
+#: ../src/common/config.py:248
+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:249
+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:250
+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 ""
+"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:251
+#, fuzzy
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indentar cuando se use una combinación de alias consecutivos."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Enviar mensaje y cerrar ventana"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Lista de colores que serán usados para colorear alias en los grupos de "
+"charla."
+
+#: ../src/common/config.py:254
+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:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+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:256
+#, fuzzy
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Si es True, te será posible definir una prioridad negativa a tu cuenta en la "
+"ventana de modificación de cuenta. SÉ CUIDADOSO, cuando estás conectado con "
+"una prioridad negativa, NO recibirás ningún mensaje de tu servidor."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
+"están definidas en las opciones de autoprioridad_*"
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Corrección Jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+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:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "¿Está OpenPGP activado para este contacto?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "estado separado por espacios o all"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no' o 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' o ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Durmiendo"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Vuelvo pronto"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Vuelvo en unos minutos."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Comiendo"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Estoy comiendo, déjame un mensaje."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Película"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Estoy viendo una película."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Trabajando"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Estoy trabajando."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Teléfono"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Estoy al teléfono."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Fuera"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Estoy fuera disfrutando la vida"
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Estoy disponible"
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Estoy libre para hablar"
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Vuelvo pronto"
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "No estoy disponible."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "No molestar."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "¡Adiós!"
+
+#: ../src/common/config.py:441
+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 ""
+"Sonido a reproducir cuando un mensaje de grupo de charla contiene una de las "
+"palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
+"contiene tu alias."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "verde"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "grocery"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "human"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marino"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "No se puede cargar el módulo idle"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Host erróneo"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, 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:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Extensión no soportada"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Alias no permitido: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "No se pudo entrar al grupo de charla"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Estás expulsado de este grupo de charla."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "No existe el grupo de charla."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "La creación de grupos de charla está restringida."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Es necesario usar el alias registrado."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "No estás en la lista de miembros"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "La autorización ha sido eliminada"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+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:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "estamos ahora suscritos a %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "petición de eliminación de suscripción de %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "ya no estamos suscritos a %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"La ID de Jabber %s no cumple la norma RFC. No será añadido a tu roster. Usa "
+"herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
+"eliminarlo"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "No se ha facilitado la clave OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Te conectarás a %s sin OpenPGP"
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "No se puede cargar el módulo idle"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Nombre de usuario no válido"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, 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:267
+msgid "Reconnect manually."
+msgstr "Reconectar manualmente."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+"El transporte %s respondió incorrectamente a la petición de registro: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Versión de D-Bus desconocida: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Respuesta no válida"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+"El transporte %s respondió incorrectamente a la petición de registro: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Falló la conexión"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "No se puede conectar a \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Comprueba tu conexión o reinténtalo más tarde."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "No se puede conectar a \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Se ha perdido la conexión de la cuenta \"%s\""
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Versión de D-Bus desconocida: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Comprueba tu conexión o inténtalo más tarde"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Falló la autentificación con \"%s\""
+
+#: ../src/common/connection.py:739
+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:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "Error añadiendo el servicio. %s"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Este mensaje está *encriptado* (Mira :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "No conseguido debido al estado invisible"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observadores"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "no está en el roster"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "falta la dependencia pysqlite2 (tcc python-pysqlite2). Saliendo..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "El nombre de la cuenta no puede estar vacío."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Servicio no disponible: Gajim no está ejecutándose, o remote_control está en "
+"False"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Bus de la sesión no disponible.\n"
+"Prueba leyendo http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "uno"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "dos"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tres"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "cuatro"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "cinco"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "seis"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "siete"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "ocho"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "nueve"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "diez"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "once"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "doce"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "$0 o'clock"
+msgstr "%0 en punto"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "five past $0"
+msgstr "%0 y cinco"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "%0 y diez"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "quarter past $0"
+msgstr "%0 y cuarto"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty past $0"
+msgstr "%0 y veinte"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty five past $0"
+msgstr "%0 y veinticinco"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "half past $0"
+msgstr "%0 y media"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "%1 menos veinticinco"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "%1 menos veinte"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "%1 menos cuarto"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "%1 menos diez"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "%1 menos cinco"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#, fuzzy
+msgid "$1 o'clock"
+msgstr "%1 en punto"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Noche"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Madrugada"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Mañana"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Media mañana"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Mediodía"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Tarde"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Noche"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Noche"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Inicio de semana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Mitad de semana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Final de semana"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "¡Fin de semana!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Caracter no válido en el nombre de usuario."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Se requiere la dirección del servidor."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Carácter no válido en el nombre del host."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Carácter no válido en el recurso."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr ""
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr ""
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr ""
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr ""
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Ocupado"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Ocupado"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_No Disponible"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Libre para hablar"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Libre para hablar"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "En líne_a"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "En línea"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Conectando"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "A_usente"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "D_esconectado"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Invisible"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Desconocido"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Tiene errores"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Ninguna"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "A"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Ambos"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Ninguna"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "_Añadir"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Ninguno"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderadores"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderador"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Participantes"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Participante"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Visitantes"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Visitante"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Ninguno"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Propietario"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Miembro"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "está prestando atención a la conversación"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "está haciendo algo más"
+
+#: ../src/common/helpers.py:405
+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:408
+msgid "paused composing a message"
+msgstr "ha parado de escribir"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "ha cerrado la ventana de chat"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Enviar mensaje"
+msgstr[1] "Enviar mensaje"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "error: no se puede abrir %s para lectura"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr ""
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "migrando registros de la base de datos a los índices"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Cuenta de Gajim %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pausado"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Negrita"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Tiene "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Charlas"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Negrita"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Contenidos"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Completado"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Contenidos"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Inactivo"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Eliminar"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Deshabilitado"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Deshabilitado"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
 msgstr "Deshabilitado"
 
-#: ../src/config.py:221
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Servidor"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "mensaje"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Invisible"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "uno"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Servidor"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Alemán"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Modificar"
+
+#: ../src/common/pep.py:85
+#, fuzzy
+msgid "Nervous"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Desconectado"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "once"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Atascado"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Última modificación:"
+
+#: ../src/common/pep.py:98
+#, fuzzy
+msgid "Serious"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Alias"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Durmiendo"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Calle:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Añadido"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Hora"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Subrayado"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Host erróneo"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Noche"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Componiendo"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Mañana"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "todos en el grupo"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Trabajando"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Noche"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Expulsando a %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Entrar"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Trabajando"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Trabajando"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Comiendo"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Cambiando el tema"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Expulsando a %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Comiendo"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Trabajando"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Expulsando a %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Comiendo"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Desconectar"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Comiendo"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Motivo"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Motivo"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Durmiendo"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Trabajando"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Comiendo"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Estoy viendo una película."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Comiendo"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Estoy al teléfono."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Transfiriendo"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Componiendo"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "_Abrir como enlace"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Trabajando"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Componiendo"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Trabajando"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Cada %s _minutos"
+msgid "Unable to bind to port %s."
+msgstr "No se puede enlazar al puerto %s."
+
+#: ../src/common/socks5.py:85
+#, fuzzy
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Podría haber otra instancia de Gajim en ejecución. La transferencia será "
+"cancelada."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
 
-#: ../src/config.py:363
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"No se pudo establecer la conexión al host: Expiró enviando información."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"El host que configuraste como la opción avanzada ft_override_host_to_send no "
+"es válido, será ignorado."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Error de Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"La mensajería de enlace local podría no funcionar correctamente."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Por favor, comprueba si Avahi está instalado."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "No se pudo iniciar servicio local"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "No se pudo enlazar al puerto %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+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:357
+#, 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:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"No estás conectado o estás invisible a los demás. Tu mensaje no pudo ser "
+"enviado."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Este mensaje está encriptado]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Error añadiendo el servicio. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Mensajes de estado por defecto"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Activar"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizado</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2628,73 +5927,111 @@ msgstr ""
 "Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
 "lenguaje definiendo la opción speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
 
-#: ../src/config.py:1074
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Nuevo mensaje recibido"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Nuevo mensaje recibido"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Mensaje enviado"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Nombre"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "¿Reconectar ahora?"
+
+#: ../src/config.py:1406
+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:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Eventos sin leer"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Has abierto una conversación con la cuenta %s"
+
+#: ../src/config.py:1694
+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:1705
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr "Eventos sin leer"
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 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:1344
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2702,177 +6039,147 @@ msgstr ""
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Gestionar cuentas"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Introduce un nuevo nombre para el grupo %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 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:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr "Vuelvo pronto"
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr "¿Reconectar ahora?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1566
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Elige tu clave OpenPGP"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 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:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 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:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Error obteniendo las claves secretas"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
-
-#: ../src/config.py:1634 ../src/config.py:3427
-msgid "OpenPGP Key Selection"
-msgstr "Selección de clave OpenPGP"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Elige tu clave OpenPGP"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Nombre"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Servidor"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
-
-#: ../src/config.py:1969
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Has abierto una conversación con la cuenta %s"
-
-#: ../src/config.py:1970
-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:2029
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 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:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2880,11 +6187,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2892,23 +6199,24 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
+#, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2916,7 +6224,7 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2932,375 +6240,494 @@ msgstr ""
 "usuario@dominio, dominio/recurso o dirección conteniendo\n"
 "un subdominio."
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 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:2645
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Todos"
+
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2749
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
 "este marcador."
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "Contraseña no válida"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Debes introducir una contraseña para la nueva cuenta"
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "Las contraseñas no coinciden"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber duplicada"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Esta cuenta ya está configurada en Gajim."
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 msgstr ""
 "Puedes configurar opciones avanzadas de la cuenta pulsando el botón "
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3100
-msgid "Your new account has been created successfully"
-msgstr "Tu nueva cuenta ha sido creada con éxito"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Especifica el nuevo alias que quieres usar:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Contacto ya presente en el roster"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Tu nueva cuenta ha sido creada con éxito"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 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:342
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, 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:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Cliente de IM Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Definir MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Mensaje de estado"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
+"nombre."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Guardar como mensaje de estado predefinido"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Dirección AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Número GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Número ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Dirección MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Dirección Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Me gustaría añadirte a mi lista de contactos"
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:906
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "No se puede enlazar al puerto %s."
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
+"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 ""
-"Podría haber otra instancia de Gajim en ejecución. La transferencia será "
-"cancelada."
+"Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
+"lenguaje definiendo la opción speller_language."
 
-#: ../src/dialogs.py:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Petición de adición para la cuenta %s de %s"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 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:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Nombre de usuario no válido"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr ""
+"La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 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:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, 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:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Sin una conexión, no puedes cambiar tu contraseña."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Servidor"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "La cuenta \"%s\" está conectada al servidor"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3309,269 +6736,376 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Contraseña no válida"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Las contraseñas no coinciden"
+
+#: ../src/dialogs.py:2025
+msgid "The passwords typed in both fields must be identical."
+msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:1887
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orden: %s, acción: %s, tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:1890
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %s, acción: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Debes introducir un nombre para crear una una lista de privacidad."
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
-#, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Estás expulsado de este grupo de charla."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s te ha invitado al grupo de charla %(room_jid)s."
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2968
+#, fuzzy, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
+msgstr "%(contact_jid)s te ha invitado al grupo de charla %(room_jid)s."
+
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "cuando esté "
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Others"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transportes"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3579,175 +7113,436 @@ 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:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 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:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Nombre de usuario no válido"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s usando la cuenta %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Ejecutar comando..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ninguno"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Histórico"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Mensaje enviado"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "alemán"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Encriptación OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Mens_aje entrante:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "General"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Características de los servidores"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Tú"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "Transferencia de archivo cancelada"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipiente: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "Transferencia de archivo detenida por el contacto de la otra parte"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Descripción: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "No se puede sobreescribir el archivo existente \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3755,31 +7550,33 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "¿Qué quieres hacer?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "No se puede escribir en el directorio \"%s\""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Guardar archivo como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -3787,60 +7584,70 @@ msgstr ""
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Archivo: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita Xserver para funcionar. Abortando..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim necesita PyGTK 2.6 o superior"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim necesita PyGTK 2.6 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim necesita GTK 2.6 o superior"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim necesita GTK 2.6 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3849,22 +7656,22 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
 "estable desde %s"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 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:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necesita pywin32 para funcionar"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3874,11 +7681,11 @@ msgstr ""
 "obtenerlo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim ya se encuentra en ejecución"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3886,214 +7693,443 @@ msgstr ""
 "Otra instancia de Gajim parece estar ya en ejecución\n"
 "¿Ejecutar otra?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autorización HTTP (%s) para %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Contraseña requerida"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/gajim.py:347
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Contraseña equivocada"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Tu alias deseado está en uso o registrado por otro ocupante. \n"
+"Por favor, especifica otro alias abajo:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "¿Aceptas esta petición?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorización HTTP (%s) para %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../src/gajim.py:706
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Mensaje de error: %s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %s ( %s )"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "Siempre le verás desconectado."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Comprueba tu conexión o reinténtalo más tarde."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s es ahora conocido como %s"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s está ahora %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está ahora %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "Contraseña incorrecta"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Se requiere una contraseña para entrar a este grupo de charla."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Contraseña incorrecta"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Correo nuevo en %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"De: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "En cada _mensaje"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+#, fuzzy
+msgid "Error."
+msgstr "Error: "
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Conflicto con nombre de usuario"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Conexión"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_No preguntarme otra vez"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Encriptación desactivada"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "No puedes entrar a un grupo de charla estando invisible"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:2090
-msgid "Network Manager support not available"
-msgstr "Soporte para gestor de red no disponible"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Marcador ya definido"
+
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Marcador añadido con éxito"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Soporte de manejo de sesión no disponible (falta el módulo gnome.ui)"
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Muestra ayuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote.py:78
-msgid "Popups a window with the next pending event"
+#: ../src/gajim-remote.py:91
+#, fuzzy
+msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea distinta"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "mensaje"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4102,19 +8138,19 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Muestra el diálogo de conversación para enviar mensajes a un contacto"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 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 "
@@ -4124,27 +8160,29 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "clave pgp"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será encriptado usando su clave pública"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 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 "
@@ -4154,130 +8192,140 @@ msgstr ""
 "como la cuenta son opcionales. Si quieres definir sólo 'cuenta' sin 'clave "
 "pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "la JID del contacto que recibirá el mensaje"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Añade nuevo contacto a esta cuenta."
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devuelve el mensaje de estado actual (el global si no se especifica una "
 "cuenta)"
 
-#: ../src/gajim-remote.py:214
-msgid "Returns number of unreaded messages"
+#: ../src/gajim-remote.py:238
+#, fuzzy
+msgid "Returns number of unread messages"
 msgstr "Devuelve el número de mensajes sin leer"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre el diálogo de iniciar conversación"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversación usando esta cuenta"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4285,11 +8333,76 @@ 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:249
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Entrar en un nuevo salón"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Salón:"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "Alias"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Alias no encontrado: %s"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "Contraseña: "
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Las contraseñas no coinciden"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Muestra u oculta la ventana de la lista de contactos"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4298,29 +8411,31 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:335
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Modo de uso: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4329,143 +8444,201 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:420
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
+"El argumento \"%s\" no se ha especificado. \n"
+"Escribe \"%s help %s\" para más información"
+
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "El argumento \"%s\" no se ha especificado. \n"
 "Escribe \"%s help %s\" para más información"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host erróneo"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "No puedes eliminar el tema actual"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "nombre del tema"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "No puedes eliminar el tema actual"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Conversación privada"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Conversaciones privadas"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, fuzzy, 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 \"%s\" o bien \"%s\" ya no existe."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Grupos de charla"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Grupos de charla"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Histórico de conversaciones"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Conexión"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Tu nueva cuenta ha sido creada con éxito"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, 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:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Afiliación: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s es ahora conocido como %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:936
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s ha sido expulsado por %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s está ahora %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Nombre de usuario no válido"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Este grupo de charla no tiene tema"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s no parece ser un JID válido"
-
-#: ../src/groupchat_control.py:1227
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"No existe tal comando: /%s (si quieres enviar esto, usa el prefijo /say)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4478,20 +8651,16 @@ msgstr ""
 "está actualmente en el grupo de conversación, el/ella será también "
 "expulsado. NO soporta espacio en el alias."
 
-#: ../src/groupchat_control.py:1259
-#, python-format
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, limpia de texto la ventana."
-
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4500,12 +8669,7 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1268
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, oculta los botones de conversación."
-
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4514,7 +8678,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al grupo de charla actual, "
 "opcionalmente proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4523,7 +8687,7 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4533,118 +8697,99 @@ msgstr ""
 "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por el "
 "alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
 
-#: ../src/groupchat_control.py:1284
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Uso: /%s <acción>, envía una acción al grupo de charla actual. Usa la "
-"tercera persona. (p.ej. /%s grita.)"
-
-#: ../src/groupchat_control.py:1288
-#, python-format
+#: ../src/groupchat_control.py:1692
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Uso: /%s <alias> [message], abre una ventana de conversación privada y envía "
 "un mensaje al ocupante especificado por el alias."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s , muestra los nombres de los ocupantes del grupo de charla."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "No hay información de ayuda para /%s"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, 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:1358
+#: ../src/groupchat_control.py:1839
 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:1362 ../src/roster_window.py:3962
-msgid "Do _not ask me again"
-msgstr "_No preguntarme otra vez"
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "Marcador ya definido"
-
-#: ../src/groupchat_control.py:1433
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Descripción: %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "Marcador añadido con éxito"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-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/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Ha sido detectado un error de programación"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4652,78 +8797,93 @@ msgstr ""
 "Probablemente no es crítico, pero no obstante debe ser informado a los "
 "desarrolladores."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Informar de fallo"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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á"
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+#, fuzzy
+msgid "Gajim is not the default Jabber client"
+msgstr "Gajim - Un cliente de Jabber en GTK+"
+
+#: ../src/gtkgui_helpers.py:734
+#, fuzzy
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "¿Quieres sobreescribirlo?"
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, 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:738
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Contactos"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Fecha"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Alias"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4731,7 +8891,7 @@ msgstr ""
 "¿Quieres limpiar la base de datos? (TOTALMENTE DESACONSEJADO SI GAJIM ESTÁ "
 "EN EJECUCIÓN)"
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 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 "
@@ -4745,140 +8905,177 @@ msgstr ""
 "\n"
 "En caso de elegir SI, por favor, espera..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Exportando historial..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dijo: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "¿Realmente quieres eliminar el historial del contacto seleccionado?"
 msgstr[1] ""
 "¿Realmente quieres eliminar el historial de los contactos seleccionados?"
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Esta es una operación irreversible"
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "¿Realmente quieres eliminar el mensaje seleccionado?"
 msgstr[1] "¿Realmente quieres eliminar los mensajes seleccionados?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones con %s"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Error: "
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está ahora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está ahora %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "No se pudo cargar la imagen"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "La imagen es demasiado grande"
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Charlas"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Grupos de charla"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Conversaciones privadas"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuevo mensaje privado desde el grupo de charla %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nuevo mensaje de %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "General"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr "Click para definir tu avatar"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Ruta del archivo"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "No existe el grupo de charla."
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr "Información publicada"
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Información NO publicada"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4886,211 +9083,153 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "Sin una conexión, no puedes obtener tu información de contacto."
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Observadores"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-msgid "You cannot join a group chat while you are invisible"
-msgstr "No puedes entrar a un grupo de charla estando invisible"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "La autorización ha sido enviada"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "usando la cuenta %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
-#, python-format
-msgid "to %s account"
-msgstr "a la cuenta %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "La petición de subscripción ha sido enviada"
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "usando la cuenta %s"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:983
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "La autorización ha sido eliminada"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "de la cuenta %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1003
-msgid "_Manage Bookmarks..."
-msgstr "Gestionar _marcadores..."
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "para la cuenta %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1053
-msgid "History Manager"
-msgstr "Histórico"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+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:1062
-msgid "_Join New Group Chat"
-msgstr "_Entrar en nuevo grupo de charla"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
+"histórico activado"
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"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 a contactos desde este transporte"
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:1393
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos desde estos transportes: %"
 "s"
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, 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:1478
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+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:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-msgid "_New group chat"
-msgstr "_Nuevo grupo de charla"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "Me gustaría añadirte a mi lista de contactos"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-msgid "Send Group M_essage"
-msgstr "Enviar mensaje a grupo"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "Re_nombrar"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr "A todos los usuarios"
-
-#: ../src/roster_window.py:2061
-msgid "To all online users"
-msgstr "A todos los usuarios en línea"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "_Conectar"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "_Desconectar"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "_Cambiar mensaje de estado"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "La autorización ha sido enviada"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Ahora \"%s\" podrá saber tu estado."
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "La petición de subscripción ha sido enviada"
-
-#: ../src/roster_window.py:2394
-#, 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:2406
-msgid "Authorization has been removed"
-msgstr "La autorización ha sido eliminada"
-
-#: ../src/roster_window.py:2407
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Ahora \"%s\" siempre te verá desconectado."
-
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5098,7 +9237,13 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización "
 "resultante y el/ella siempre te verán desconectado."
 
-#: ../src/roster_window.py:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "¿Qué quieres hacer?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5106,16 +9251,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:3144
 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:2631
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5125,88 +9270,36 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Te conectarás a %s sin OpenPGP"
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "Contraseña requerida"
-
-#: ../src/roster_window.py:2711
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Introduce contraseña GPG para la cuenta %s"
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Guardar contraseña"
-
-#: ../src/roster_window.py:2724
-msgid "Wrong Passphrase"
-msgstr "Contraseña equivocada"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-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:2783 ../src/roster_window.py:2843
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 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:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" por %(artist)s"
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
-"histórico activado"
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: ../src/roster_window.py:3956
+#: ../src/roster_window.py:3784
 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:3958
+#: ../src/roster_window.py:3786
+#, fuzzy
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"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 ""
@@ -5214,110 +9307,321 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Archivo no válido"
+
+#: ../src/roster_window.py:3910
+#, 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 quiere enviarte un archivo:"
+msgstr[1] "%s quiere enviarte un archivo:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "usando la cuenta %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "a la cuenta %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "usando la cuenta %s"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "Gestionar _marcadores..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Depositar %s en el grupo %s"
+msgid "of account %s"
+msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:4132
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Hacer %s y %s metacontactos"
+msgid "for account %s"
+msgstr "para la cuenta %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Cambiar mensaje de estado"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publicar"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
 
-#: ../src/roster_window.py:4319
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Activo"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Descubrir servicios..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Enviar mensaje a grupo"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "A todos los usuarios"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "A todos los usuarios en línea"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Me gustaría añadirte a mi lista de contactos"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Renombrar contacto"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Enviar mensaje"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportes"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Mostrar Trans_portes"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contacto desconectado"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Nuevo grupo de charla"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Histórico"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Entrar en nuevo grupo de charla"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Conexión"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Contacto desconectado"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Salón:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Activo"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipo:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 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:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5325,24 +9629,25 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Afiliación:"
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5350,7 +9655,7 @@ msgstr ""
 "Este contacto está interesado en la información de tu presencia, pero tú no "
 "lo estás en la suya"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5358,14 +9663,14 @@ msgstr ""
 "Estás interesado en la información de la presencia del contacto, pero él/"
 "ella no lo está en la tuya"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
 #. None
-#: ../src/vcard.py:291
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5373,1301 +9678,436 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Estás esperando la respuesta del contacto acerca de tu petición de adición"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " recurso con prioridad "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "creando base de datos de registros"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "%s es un archivo pero podría ser un directorio"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim se cerrará ahora"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "%s es un directorio pero podría ser un archivo"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "creando directorio %s"
-
-#: ../src/common/config.py:55
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tiempo en minutos, después de haber cambiado a ausente"
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "Ausente por inactividad"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "No disponible por inactividad"
-
-# duda sobre collapsed
-#: ../src/common/config.py:82
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-"Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Habilitar mensajería de enlace local / zeroconf"
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr "Lenguaje usado por el corrector"
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'siempre' - muestra la hora en cada mensaje.\n"
-"'a veces' - muestra la hora cada print_ichat_every_foo_minutes minutos.\n"
-"'nunca' - nunca muestra la hora."
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
-
-#: ../src/common/config.py:96
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
-"* *"
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-"Usa la sintaxis ReStructured para HTML, mas el formateo ascii si está "
-"seleccionado. (Si quieres usarlo, instala docutils)"
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Carácter a añadir tras el alias cuando se usa completado de alias (tab) en "
-"los grupos de charla."
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Carácter a proponer para añadir tras el alias deseado cuando el alias "
-"deseado está siendo usado por alguien en el grupo de charla."
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "¿Añadir * y [n] en el título del roster?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
-"una pestaña/ventana de conversación"
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Cuántos minutos debe durar la última línea de la conversación anterior."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
-"del cliente Mirabilis ICQ)"
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
-"significa usar wiktionary"
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
-
-#: ../src/common/config.py:154
-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 ""
-"Si es True, escucha las señales D-Bus de NetworkManager y los cambios del "
-"estado de las cuentas (con tal de que no tengan listen_to_network_manager "
-"puesto en False y sincronicen con el estado global) basados en el estado de "
-"la conexión de la red."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Las notificaciones de estado mostradas en las ventanas de conversación. "
-"Pueden ser all, composing_only o disabled."
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Cuando no se muestra la hora en cada mensaje (print_time==sometimes), la "
-"muestra cada x minutos."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Preguntar siempre antes de cerrar la ventana/pestaña de un grupo de charla "
-"en esta lista (separada por espacios) de ID de Jabber de grupos de charla."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Nunca preguntar antes de cerrar la ventana/pestaña de un grupo de "
-"conversación en esta lista (separada por espacios) de ID de Jabber de grupos "
-"de charla."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Se elimina el host que enviamos para la transferencia de un archivo en caso "
-"de traducción de la dirección o redirección de puertos."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Notifica eventos en el área de notificación."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
-
-#: ../src/common/config.py:175
-#, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Mostrar borde pestañeado de bloc en las ventanas de conversación?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "¿Mostrar botón de cerrar en la pestaña?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
-"de charla."
-
-#: ../src/common/config.py:190
-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 ""
-"Si es True, cierra Gajim cuando el botón X del gestor de ventanas es "
-"pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
-"notificación. "
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
-"sin leer. Dependiendo del tema, este icono puede ser animado."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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 ""
-"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:196
-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 ""
-"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:197
-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 ""
-"puede ser \"none\", \"all\" o \"in_and_out\". Si es \"none\", Gajim no "
-"volverá a mostar la línea de estado en los grupos de charla cuando un "
-"miembro cambie su mensaje de estado. Si es \"all\" Gajim mostrará todos los "
-"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:199
-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:200
-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:202
-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:203
-msgid "Don't show avatar for the transport itself."
-msgstr "No mostrar avatar para el transporte en sí mismo"
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "No mostrar roster en la barra de tareas."
-
-#: ../src/common/config.py:205
-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 ""
-"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:207
-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 ""
-"A Jabberd1.4 no le gusta la información sha cuando se entra en un grupo de "
-"conversación protegido por contraseña. Cambia esta opción a False para para "
-"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:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Controla la ventana donde se depositan los nuevos mensajes.\n"
-"'always' - Todos los mensajes son enviados a una ventana única.'never' - "
-"Todos los mensajes obtienen su propia ventana.'peracct' - Los mensajes para "
-"cada cuenta son enviados a una ventana específica.\n"
-"'pertype' - Cada tipo de mensaje (p.ej., conversaciones vs. grupos de "
-"charla) es enviado a una ventana específica. Nota: cambiar esta opción "
-"requiere reiniciar Gajim para que los cambios tengan efecto."
-
-#: ../src/common/config.py:211
-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:212
-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:213
-msgid "Hides the buttons in group chat window."
-msgstr "Oculta los botones en las ventanas de grupo de charla."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Oculta los botones en las ventanas de conversación de dos personas."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Oculta el banner en una ventana de grupo de charla"
-
-#: ../src/common/config.py:216
-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:217
-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:218
-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 ""
-"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:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr "Indentar cuando se use una combinación de alias consecutivos."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"Lista de colores que serán usados para colorear alias en los grupos de "
-"charla."
-
-#: ../src/common/config.py:221
-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:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-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:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"Si es True, te será posible definir una prioridad negativa a tu cuenta en la "
-"ventana de modificación de cuenta. SÉ CUIDADOSO, cuando estás conectado con "
-"una prioridad negativa, NO recibirás ningún mensaje de tu servidor."
-
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
-"están definidas en las opciones de autoprioridad_*"
-
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr "Corrección Jabberd2"
-
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-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:326
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "¿Está OpenPGP activado para este contacto?"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-msgid "Language for which we want to check misspelled words"
-msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
-
-#: ../src/common/config.py:336
-msgid "all or space separated status"
-msgstr "estado separado por espacios o all"
-
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' o 'both'"
-
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' o ''"
-
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "Durmiendo"
-
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "Vuelvo pronto"
-
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "Vuelvo en unos minutos."
-
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "Comiendo"
-
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "Estoy comiendo, déjame un mensaje."
-
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "Película"
-
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "Estoy viendo una película."
-
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "Trabajando"
-
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "Estoy trabajando."
-
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "Teléfono"
-
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "Estoy al teléfono."
-
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "Fuera"
-
-#: ../src/common/config.py:357
-msgid "I'm out enjoying life."
-msgstr "Estoy fuera disfrutando la vida"
-
-#: ../src/common/config.py:361
-msgid "I'm available."
-msgstr "Estoy disponible"
-
-#: ../src/common/config.py:362
-msgid "I'm free for chat."
-msgstr "Estoy libre para hablar"
-
-#: ../src/common/config.py:364
-msgid "I'm not available."
-msgstr "No estoy disponible."
-
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr "No molestar."
-
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr "¡Adiós!"
-
-#: ../src/common/config.py:376
-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 ""
-"Sonido a reproducir cuando un mensaje de grupo de charla contiene una de las "
-"palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
-"contiene tu alias."
-
-#: ../src/common/config.py:377
-msgid "Sound to play when any MUC message arrives."
-msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
-
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "verde"
-
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr "grocery"
-
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "human"
-
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "marino"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "No se puede cargar el módulo idle"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Host erróneo"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"El host que configuraste como la opción avanzada ft_override_host_to_send no "
-"es válido, será ignorado."
-
-#: ../src/common/connection_handlers.py:590
-#, 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:1523
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alias no permitido: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
-msgid "Unable to join group chat"
-msgstr "No se pudo entrar al grupo de charla"
-
-#: ../src/common/connection_handlers.py:1586
-msgid "A password is required to join this group chat."
-msgstr "Se requiere una contraseña para entrar a este grupo de charla."
-
-#: ../src/common/connection_handlers.py:1589
-msgid "You are banned from this group chat."
-msgstr "Estás expulsado de este grupo de charla."
-
-#: ../src/common/connection_handlers.py:1592
-msgid "Such group chat does not exist."
-msgstr "No existe el grupo de charla."
-
-#: ../src/common/connection_handlers.py:1595
-msgid "Group chat creation is restricted."
-msgstr "La creación de grupos de charla está restringida."
-
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "Es necesario usar el alias registrado."
-
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "No estás en la lista de miembros"
-
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Tu alias deseado está en uso o registrado por otro ocupante. \n"
-"Por favor, especifica otro alias abajo:"
-
-#: ../src/common/connection_handlers.py:1659
-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:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos ahora suscritos a %s"
-
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "petición de eliminación de suscripción de %s"
-
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ya no estamos suscritos a %s"
-
-#: ../src/common/connection_handlers.py:1854
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"La ID de Jabber %s no cumple la norma RFC. No será añadido a tu roster. Usa "
-"herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
-"eliminarlo"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, 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:176
-msgid "Reconnect manually."
-msgstr "Reconectar manualmente."
-
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
-"El transporte %s respondió incorrectamente a la petición de registro: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Respuesta no válida"
-
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "No se puede conectar a \"%s\""
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Conectado al servidor %s:%s con %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Comprueba tu conexión o inténtalo más tarde"
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Falló la autentificación con \"%s\""
-
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr ""
-"Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "No se ha facilitado la clave OpenPGP"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "invisible"
-
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "desconectado"
-
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "Estoy %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Este mensaje está *encriptado* (Mira :JEP:`27`]"
-
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Tema: %s\n"
-"%s"
-
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr "No conseguido debido al estado invisible"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "falta la dependencia pysqlite2 (tcc python-pysqlite2). Saliendo..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Servicio no disponible: Gajim no está ejecutándose, o remote_control está en "
-"False"
-
-#: ../src/common/exceptions.py:38
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
-
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Bus de la sesión no disponible.\n"
-"Prueba leyendo http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "uno"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " recurso con prioridad "
 
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "dos"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Encriptación OpenPGP"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tres"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s no ha difundido su clave OpenPGP ni tú le has asignado una"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "cuatro"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "No existe tal comando: /%s (si quieres enviar esto, usa el prefijo /say)"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "cinco"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%s <acción>, envía una acción al grupo de charla actual. Usa la "
+#~ "tercera persona. (p.ej. /%s grita.)"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "seis"
+#~ msgid "Encryption enabled"
+#~ msgstr "Encriptación activada"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "siete"
+#~ msgid "Encryption disabled"
+#~ msgstr "Encriptación desactivada"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "ocho"
+#~ msgid "<b>Please fill in the data for your new account</b>"
+#~ msgstr "<b>Por favor, introduce los datos para tu nueva cuenta</b>"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "nueve"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Reintroduce la contraseña:"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "diez"
+#~ msgid "_Use proxy"
+#~ msgstr "_Usar proxy"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "once"
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Si está marcado, todos los contactos locales que usen un cliente Bonjour "
+#~ "compatible (como iChat, Trillian o Gaim) se mostrarán en el roster. No "
+#~ "necesitas estar conectado a un servidor jabber para su funcionamiento,\n"
+#~ "Esto sólamente está disponible si python-avahi está instalado y avahi-"
+#~ "daemon se encuentra en ejecución."
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "doce"
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Si tienes dos o más cuentas y está marcado, Gajim listará todos los "
+#~ "contactos de forma mixta"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr "%0 en punto"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "Habilitar m_ensajería de enlace local"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr "%0 y cinco"
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo y Julieta</small>"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr "%0 y diez"
+#~ msgid "Old stories"
+#~ msgstr "Historias viejas"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr "%0 y cuarto"
+#~ msgid "Soliloquy"
+#~ msgstr "Soliloquio"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr "%0 y veinte"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Click para ver anteriores conversaciones con este contacto"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr "%0 y veinticinco"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "Vista _compacta    Alt+C"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr "%0 y media"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Click para ver anteriores conversaciones en este salón"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr "%1 menos veinticinco"
+#~ msgid "Build custom query"
+#~ msgstr "Construir consulta personalizada"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr "%1 menos veinte"
+#~ msgid "Query Builder..."
+#~ msgstr "Constructor de consultas..."
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr "%1 menos cuarto"
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "ten to %1"
-msgstr "%1 menos diez"
+#~ msgid "Invitation Received"
+#~ msgstr "Invitación recibida"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr "%1 menos cinco"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Formato del renglón</b>"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr "%1 en punto"
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Personalización de la interfaz</b>"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr "Noche"
+#~ msgid "A_fter nickname:"
+#~ msgstr "Después del alias:"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr "Madrugada"
+#~ msgid "Also known as iChat style"
+#~ msgstr "También conocido como estilo iChat"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Morning"
-msgstr "Mañana"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Un ejemplo: Si tienes activado el mensaje de estado para ausente, Gajim "
+#~ "no te preguntará más por un mensaje de estado cuando cambies tu estado a "
+#~ "ausente; simplemente aplicará el mensaje predefinido para ausente"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr "Media mañana"
+#~ msgid "B_efore nickname:"
+#~ msgstr "Ant_es del alias:"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Noon"
-msgstr "Mediodía"
+#~ msgid "Chat"
+#~ msgstr "Charla"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr "Tarde"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Cada 5 _minutos"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Evening"
-msgstr "Noche"
+#~ msgid "Events"
+#~ msgstr "Eventos"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr "Noche"
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr ""
+#~ "Gajim mostrará automáticamente nuevos eventos emergiendo la ventana "
+#~ "relativa"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr "Inicio de semana"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim te notificará de nuevos eventos a través de un mensaje emergente en "
+#~ "la esquina inferior derecha de la pantalla"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr "Mitad de semana"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim notificará con un mensaje emergente en la parte inferior derecha de "
+#~ "la pantalla cuando un contacto se conecte"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr "Final de semana"
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim sólo mostrará el icono del contacto que provocó el nuevo evento"
 
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr "¡Fin de semana!"
+#~ 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 ""
+#~ "Si está marcado, Gajim recordará la posición del roster y ventanas de "
+#~ "conversación en la pantalla y sus tamaños para la próxima vez que "
+#~ "aparezcan"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Caracter no válido en el nombre de usuario."
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Nunca\n"
+#~ "Siempre\n"
+#~ "Por cuenta\n"
+#~ "Por tipo"
 
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Se requiere la dirección del servidor."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Notificaciones salientes del estado de conversación:"
 
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Carácter no válido en el nombre del host."
+#~ msgid "Print time:"
+#~ msgstr "Insertar la hora:"
 
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Carácter no válido en el recurso."
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Guarda _posición y tamaño para las ventanas de conversaciones y lista de "
+#~ "contactos"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr ""
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr ""
+#~ "Cambiar el mensaje de estado para reflejar la pista_musical en curso"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr ""
+#~ msgid "Show only in _roster"
+#~ msgstr "Sólo mostrar en la _lista de contactos"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr ""
+#~ msgid "The auto away status message"
+#~ msgstr "El mensaje de estado de auto-ausencia"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr ""
+#~ msgid "The auto not available status message"
+#~ msgstr "El mensaje de estado de no auto-no disponible"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr ""
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Usar icono en el á_rea de notificación"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr ""
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Cuando se recibe un nuevo evento (mensaje, envío de archivos, etc...), "
+#~ "pueden ser usados los siguientes métodos para informar. Observa que los "
+#~ "eventos de nuevos mensajes sólo ocurren si proceden de un contacto con el "
+#~ "que no estabas ya conversando"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr ""
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Funciona para los reproductores Rythmbox and Muine. Para más "
+#~ "reproductores, visita http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Ocupado"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Control de notificaciones _avanzadas..."
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Ocupado"
+#~ msgid "_After time:"
+#~ msgstr "_Después de la hora:"
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_No Disponible"
+#~ msgid "_Before time:"
+#~ msgstr "_Antes de la hora"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Libre para hablar"
+#~ msgid "_Font:"
+#~ msgstr "_Fuente:"
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Libre para hablar"
+#~ msgid "_Never"
+#~ msgstr "_Nunca"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "En líne_a"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Notificarme"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "En línea"
+#~ msgid "_Player:"
+#~ msgstr "_Reproductor:"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Conectando"
+#~ msgid "_Pop it up"
+#~ msgstr "_Emerger"
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "A_usente"
+#~ msgid "Address"
+#~ msgstr "Dirección"
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "D_esconectado"
+#~ msgid "City:"
+#~ msgstr "Ciudad:"
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Desconectado"
+#~ msgid "Company:"
+#~ msgstr "Compañía:"
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "_Invisible"
+#~ msgid "Country:"
+#~ msgstr "País:"
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "Desconocido"
+#~ msgid "Given:"
+#~ msgstr "Nombre de pila:"
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "Tiene errores"
+#~ msgid "Middle:"
+#~ msgstr "Medio:"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "Ninguna"
+#~ msgid "Position:"
+#~ msgstr "Posición:"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "A"
+#~ msgid "Prefix:"
+#~ msgstr "Prefijo"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Ambos"
+#~ msgid "Role:"
+#~ msgstr "Puesto:"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "Ninguna"
+#~ msgid "State:"
+#~ msgstr "Estado:"
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "_Añadir"
+#~ msgid "Suffix:"
+#~ msgstr "Sufijo:"
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "Ninguno"
+#~ msgid "_Retrieve"
+#~ msgstr "_Recuperar"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Moderadores"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Eliminar del Roster"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Moderador"
+#~ msgid "A_ccounts"
+#~ msgstr "_Cuentas"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Participantes"
+#~ msgid "_Filter:"
+#~ msgstr "_Filtro:"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Participante"
+#~ msgid "Ask:"
+#~ msgstr "Pregunta:"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Visitantes"
+#~ msgid "Client:"
+#~ msgstr "Cliente:"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Visitante"
+#~ msgid "OS:"
+#~ msgstr "SO:"
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Ninguno"
+#~ msgid "Subscription:"
+#~ msgstr "Subscripción:"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Propietario"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Si este no es el idioma para el quieres resaltar las palabras mal "
+#~ "escritas debes definir la variable $LANG con el valor apropiado. P. ej, "
+#~ "para el Francés haz export LANG=fr_FR o export LANG=fr_FR.UTF-8 en ~/."
+#~ "bash_profile o hazlo globalmente en /etc/profile.\n"
+#~ "\n"
+#~ "El resalto de palabras mal escritas no será usado"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Administrador"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Cada %s _minutos"
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Miembro"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "está prestando atención a la conversación"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Siempre le verás desconectado."
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "está haciendo algo más"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s está ahora %s (%s)"
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "está escribiendo..."
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "De: %(from_address)s"
 
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "ha parado de escribir"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Soporte para gestor de red no disponible"
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "ha cerrado la ventana de chat"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Soporte de manejo de sesión no disponible (falta el módulo gnome.ui)"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d mensaje sin leer"
-msgstr[1] "%d mensajes sin leer"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Modo de uso: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d mensaje único sin leer"
-msgstr[1] "%d mensajes únicos sin leer"
+#~ msgid "Private Chat"
+#~ msgstr "Conversación privada"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d mensaje de grupo de charla sin leer"
-msgstr[1] "%d mensajes de grupo de charla sin leer"
+#~ msgid "Group Chat"
+#~ msgstr "Grupos de charla"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d mensaje privado sin leer"
-msgstr[1] "%d mensajes privados sin leer"
+#~ msgid "%s is now %s"
+#~ msgstr "%s está ahora %s"
 
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s no parece ser un JID válido"
 
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "error: no se puede abrir %s para lectura"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr ""
+#~ msgid "Information published"
+#~ msgstr "Información publicada"
 
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr ""
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr "Sin una conexión, no puedes obtener tu información de contacto."
 
-#: ../src/common/optparser.py:302
-msgid "migrating logs database to indeces"
-msgstr "migrando registros de la base de datos a los índices"
+#~ msgid "_New group chat"
+#~ msgstr "_Nuevo grupo de charla"
 
-#: ../src/common/passwords.py:86
-#, python-format
-msgid "Gajim account %s"
-msgstr "Cuenta de Gajim %s"
+#~ msgid "_Log on"
+#~ msgstr "_Conectar"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"No se pudo establecer la conexión al host: Respuesta incorrecta del servidor."
+#~ msgid "Log _off"
+#~ msgstr "_Desconectar"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "No se pudo establecer la conexión al host"
+#~ msgid "Save passphrase"
+#~ msgstr "Guardar contraseña"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"No se pudo establecer la conexión al host: Expiró enviando información."
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Depositar %s en el grupo %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Hacer %s y %s metacontactos"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
+#~ msgid "Affiliation:"
+#~ msgstr "Afiliación:"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Error de Avahi"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Oculta los botones en las ventanas de conversación de dos personas."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"La mensajería de enlace local podría no funcionar correctamente."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Conectado al servidor %s:%s con %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Por favor, comprueba si Avahi está instalado."
+#~ msgid "invisible"
+#~ msgstr "invisible"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "No se pudo iniciar servicio local"
+#~ msgid "offline"
+#~ msgstr "desconectado"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "No se pudo enlazar al puerto %d."
+#~ msgid "I'm %s"
+#~ msgstr "Estoy %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d mensaje único sin leer"
+#~ msgstr[1] "%d mensajes únicos sin leer"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "No se pudo cambiar el estado de la cuenta \"%s\""
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d mensaje de grupo de charla sin leer"
+#~ msgstr[1] "%d mensajes de grupo de charla sin leer"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"No estás conectado o estás invisible a los demás. Tu mensaje no pudo ser "
-"enviado."
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d mensaje privado sin leer"
+#~ msgstr[1] "%d mensajes privados sin leer"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Este mensaje está encriptado]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "No se pudo establecer la conexión al host: Respuesta incorrecta del "
+#~ "servidor."
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Error añadiendo el servicio. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "No se pudo establecer la conexión al host"
 
 #~ msgid "This is result of query."
 #~ msgstr "Este es el resultado de la consulta."
@@ -6681,9 +10121,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Role: "
 #~ msgstr "Rol: "
 
-#~ msgid "Affiliation: "
-#~ msgstr "Afiliación: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -6703,9 +10140,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "cs"
 #~ msgstr "checo"
 
-#~ msgid "de"
-#~ msgstr "alemán"
-
 #~ msgid "el"
 #~ msgstr "Griego"
 
@@ -6766,18 +10200,12 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nombre de usuario no válido"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Versión de D-Bus desconocida: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard publicada con éxito"
 
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Tu información personal ha sido publicada con éxito"
 
-#~ msgid "_Join New Room"
-#~ msgstr "_Entrar en un nuevo salón"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d mensaje sin leer"
@@ -6813,27 +10241,15 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Send File"
 #~ msgstr "Enviar archivo"
 
-#~ msgid "Underline"
-#~ msgstr "Subrayado"
-
-#~ msgid "Would you like to overwrite it?"
-#~ msgstr "¿Quieres sobreescribirlo?"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "E_ntrar a un nuevo salón..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr "Uso: /%s, cambia la ventana de salón a modo compacto."
-
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Por favor, elige una de las siguientes opciones:</b>"
 
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Eliminar mensaje del día"
 
-#~ msgid "I want a notification popup:"
-#~ msgstr "Noti_ficaciones del estado del chat"
-
 #~ msgid "I want to listen to:"
 #~ msgstr "%s quiere enviarte un archivo:"
 
@@ -6849,9 +10265,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "_XML Console..."
 #~ msgstr "Consola _XML..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "Elegir avatar"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Usar vista compacta cuando abras una ventana de conversación"
 
@@ -6870,11 +10283,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "El registro ha sido migrado satisfactoriamente a la base de datos"
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr ""
-#~ "Si está marcado, Gajim alojará un icono en el área de notificación del "
-#~ "sistema"
-
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Iniciar conversación con la cuenta %s"
 
@@ -6891,15 +10299,9 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Sound"
 #~ msgstr "Sonido"
 
-#~ msgid "Text"
-#~ msgstr "Texto"
-
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
-#~ msgid "From %s"
-#~ msgstr "De %s"
-
 #~ msgid "To %s"
 #~ msgstr "A %s"
 
@@ -6974,9 +10376,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ "datos, por favor lee: http://trac.gajim.org/wiki/MigrateLogToDot9DB. "
 #~ "Saliendo..."
 
-#~ msgid "Image is too big"
-#~ msgstr "La imagen es demasiado grande"
-
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
@@ -7023,9 +10422,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Send Authorization to"
 #~ msgstr "Enviar autorización a"
 
-#~ msgid "<b>Log</b>"
-#~ msgstr "<b>Registro</b>"
-
 #~ msgid "Log presences in _contact's log file"
 #~ msgstr "Registrar los estados en el registo del contacto"
 
@@ -7055,9 +10451,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "_Latest"
 #~ msgstr "_Últimos"
 
-#~ msgid "_Previous"
-#~ msgstr "_Anterior"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s está ahora %s: %s"
 
@@ -7084,9 +10477,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ "Puedes definir opciones avanzadas usando \"Editar->Cuentas\" desde "
 #~ "laventana principal."
 
-#~ msgid "Error:"
-#~ msgstr "Error: "
-
 #~ msgid "Service"
 #~ msgstr "Servicio"
 
@@ -7122,9 +10512,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "theme_name"
 #~ msgstr "nombre_del_tema"
 
-#~ msgid "<b>Please fill in the data for your existing account</b>"
-#~ msgstr "Por favor, introduce los datos de tu cuenta actual"
-
 #~ msgid "Check if you want to register for a new jabber account"
 #~ msgstr "Comprueba si quieres registrar una nueva cuenta de Jabber"
 
@@ -7140,9 +10527,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "_Register new account"
 #~ msgstr "_Registrar nueva cuenta"
 
-#~ msgid "Gajim - a GTK+ Jabber client"
-#~ msgstr "Gajim - Un cliente de Jabber en GTK+"
-
 #~ msgid "You just received a new message in room \"%s\""
 #~ msgstr "Has recibido un nuevo mensaje en el salón \"%s\""
 
@@ -7173,9 +10557,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgid "Inactivate account"
 #~ msgstr "No tienes cuentas activas"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Entrar a un grupo de charla"
-
 #~ msgid "Po_sition:"
 #~ msgstr "Posición:"
 
@@ -7206,9 +10587,6 @@ msgstr "Error añadiendo el servicio. %s"
 #~ msgstr[0] "Gajim - un mensaje sin leer"
 #~ msgstr[1] "Gajim - %d mensajes sin leer"
 
-#~ msgid "Unknown type %s "
-#~ msgstr "tipo no conocido %s "
-
 #~ msgid "Gajim disconnected you from %s"
 #~ msgstr "Gajim te ha desconectado de %s"
 
diff --git a/po/eu.po b/po/eu.po
index 8eed5a4af..069307b56 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2006-12-09 17:38+0100\n"
 "Last-Translator: Urtzi \n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -31,44 +30,53 @@ msgid "Jabber IM Client"
 msgstr "IM Jabber Bezeroa"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Bidali _Mezu Bakarra..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Zerbitzuak Aurkitu..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "Txat _Taldea"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Kontua E_raldatu"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "Kontua E_ditatu"
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -81,54 +89,80 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Konektatu bukatu sakatzen dudanean."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu Sortzailearen Wizard-a"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Pasa_hitza:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Moldatu..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Ezarri nire profila konektatzen naizenean"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Erabili bezeroaren hostname/portua"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -136,67 +170,64 @@ msgstr ""
 "Kontu bat behar duzu\n"
 "Jabber sarera konektatzeko"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Zure JID-a:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "A_urreratua"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Host-a"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Hostname: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Portua:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Berridatzi Pasahitza"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Proxy erabili"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Izena"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Denetatik</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazio Pertsonala</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Kontua"
 
@@ -205,19 +236,29 @@ msgid "Account Modification"
 msgstr "Kontu Eraldaketa"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Konektatu berriro konexioa galtzean"
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Administratzaile Zerrenda"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Konektatu berriro konexioa galtzean"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Al_datu Pasahitza"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -229,44 +270,61 @@ msgstr ""
 "default if broadcasted by the server, and with this option enabled TLS will "
 "be disabled"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Aukeratu _Kodea...."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Sakatu kontuaren pasahitza aldatzeko"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Konektatu"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Informazio Pertsonala Editatu..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Orokorra"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Hostname: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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."
@@ -274,15 +332,17 @@ 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:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
 "Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
 "gerta ez dadin"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -291,7 +351,8 @@ msgstr ""
 "Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu "
 "irakurtzeko baimena zuk bakarrik izanik"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -300,7 +361,8 @@ msgstr ""
 "Hautatua badago, abiaraztean, automatikoki jabber-era konektatuko da kontu "
 "hau erabiliz"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -311,44 +373,49 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Moldatu..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ezer ez"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazio Pertsonala "
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Portua: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Lehentas_una:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -358,19 +425,23 @@ msgstr ""
 "berdinarekin, zeinek jaso behar duen informazioa determinatzen du; "
 "Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Lehentasuna automatikoki ezarriko da zure egoeraren arabera."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+#, fuzzy
+msgid "Resour_ce:"
 msgstr "Baliabid_ea: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -384,92 +455,159 @@ msgstr ""
 "jarrita eta kontu berdera `etxea` baliabidearekin jarria baduzu, mezua "
 "lehentasun handiena duenera bidaliko da. (Behean ikusi) "
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Gorde _pasa-esaldia(ez trinkoa)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Erabili bezeroaren hostname/portua"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Erabili proxy fitxero transferentzia"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "Egoerarekin b_at egin"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "_Izena "
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ezaugarriak</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Kontuak"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Aukeratuta badago, Bonnjour-ekin bateragarriak diren txat programak (iChat, "
-"Trillian edota Gaim bezalakoak) erabiltzen duten kontaktu guztiak azal "
-"araziko dira zerrendan. Ez duzu jabber zerbitzari batera konektatu egon "
-"beharrik funtziona dezan.\n"
-"Hau erabilgarri izango da python-avahi instalatuta baldin badago eta avahi-"
-"daemon funtzionamenduan  badago. "
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Posta:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktibatu"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ""
-"Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek "
-"kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan"
+"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:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Azken Izena:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Batu kontuak"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Enable link-local messaging"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "_Berrizenpetu"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Eraldatu"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Ezabatu"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Erabili ezarritako portua:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -488,8 +626,9 @@ 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
+#, fuzzy
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -527,7 +666,8 @@ msgid "_User ID:"
 msgstr "E_rabiltzailearen ID:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
-msgid "<b>An error has occured:</b>"
+#, fuzzy
+msgid "<b>An error has occurred:</b>"
 msgstr "<b>Akats bat gertatu da:</b>"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -563,11 +703,13 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Deskribapena</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+#, 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"
@@ -589,46 +731,47 @@ msgid "Deletes Message of the Day"
 msgstr "Eguneko Mezuak Ezabatu"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Debekatze Zerrenda"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#, 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:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Ezarri MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Ezarri Eguneko Mezua"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "_XML Konsola Ikusarazi"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "MOTD Gaurkotu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Eguneko Mezua Gaurkotu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administratzailea"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Debekatze Zerrenda"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Bidali Zerbitzarira Mezua"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Bidali Mezu Bakarra"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr "leiho/tab bat kontaktu batekin irekia"
@@ -642,7 +785,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Baldintzak</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Soinuak</b>"
 
@@ -659,7 +802,7 @@ msgid "All statuses"
 msgstr "Egoera Guztiak"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Kanpoan"
 
@@ -676,7 +819,7 @@ msgid "Have "
 msgstr "daukadanean"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Ikusezin"
 
@@ -685,7 +828,7 @@ msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
@@ -702,16 +845,16 @@ msgid "Play a sound"
 msgstr "Soinua ezarri"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
+#, fuzzy
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 "Mezu bat Jasoa\n"
 "Kontaktua Konektatua\n"
@@ -723,57 +866,57 @@ msgstr ""
 "Fitxero Transferentzia Hasia\n"
 "Fitxero Transferentzia Bukatua"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr "Denean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.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:29
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Ezindu automatikoki elkarrizketa leihoa irikitzea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr "_Kendu esistitzen den popup leihoa "
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Ezindu esistitzen den soinua gertaera hontarako "
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Ezindu gertaeran zerrendan ikustea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Ezindu gertaerak systray-en ikustea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Jakinarazi popup leiho batekin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Open chat window with user"
 msgstr "_Ireki elkarrizketa leihoa erabiltzailearekin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Show event in roster"
 msgstr "_Ikusarazi gertaera zerrendan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
 msgstr "Iku_si gertaerak systray-ean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr "eta nik"
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -783,50 +926,62 @@ msgstr ""
 "taldea(k)\n"
 "denak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 msgid "for "
 msgstr "norentzat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr "Nagoenean"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Romeo eta Juliet</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Sarrera:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Emandako izena:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Azken Eraldaketa:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Ekintza berri bat jasoa"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Old stories"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Soliloquy"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Sarrera berri bat jaso duzu:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Kontaktua"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Egoera Mezu Ezarriak</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Egoera Mezu Ezarriak</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Soinuak</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
@@ -856,10 +1011,9 @@ msgid "Join _Group Chat"
 msgstr "Txat Taldean _Sartu"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Zerrendara Sartu"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -879,39 +1033,70 @@ msgid "_Open Link in Browser"
 msgstr "Web-ean _Ireki Lotura"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontaktua"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Bidali _Fitxeroa"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Toggle Open_PGP Encryption"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Bista trikoa        Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Zerrendara Sartu"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historiala"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Honera gonbidatu"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Begiratzaileak"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Formularioan bete"
@@ -924,6 +1109,24 @@ msgstr "Gelaren Konfigurazioa"
 msgid "Edit Groups"
 msgstr "Taldeak Editatu"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Deskribapena</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Zerbitzariaren Ezaugarriak:"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
@@ -959,13 +1162,15 @@ msgid "Remove file transfer from the list."
 msgstr "Listatik fitxero tranferentzia ezabatu."
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, 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
-msgid "Shows a list of file transfers between you and other"
+#, 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
@@ -980,7 +1185,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -988,7 +1193,7 @@ msgstr "_Jarraitu"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
@@ -1036,7 +1241,7 @@ msgstr "Gajim-en Gaien Kustomizatazailea"
 msgid "Gone"
 msgstr "Joanda"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inaktiboa"
 
@@ -1077,58 +1282,72 @@ msgid "_Background:"
 msgstr "A_tzealdeko kolorea:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Aldatu _Izengoitia"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Aldatu _Gaia"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Sakatu gela honetako elkarrizketa zaharrak ikusteko"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Gela Konfigu_ratu"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Gela Konfigu_ratu"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Talde Agendan Sartu Gela hau"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Talde Agendan Sartu Gela hau"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_deratzailea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Bete Beharreko Aukerak"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Bota"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Partaidea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Bete Beharreko Aukerak"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Jabea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Bidali Mezu Pribatu bat"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Ahotsa"
 
@@ -1136,22 +1355,19 @@ msgstr "_Ahotsa"
 msgid "Create new post"
 msgstr "Mezu berria sortu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "-etik"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Gaia"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1164,82 +1380,87 @@ 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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim Historialeko Log Administratzailea"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Esportatu"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Historialeko Log Administratzailea"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Bilatu Datu Basean"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Build custom query"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Elkarrizketaren Historiala"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Query Builder..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Bilatu"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Bilatu"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Onartu"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Ukatu"
+#, fuzzy
+msgid "Search:"
+msgstr "Bilatu"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Gonbidapena Jasoa"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "Elkarrizketaren _historiala"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Izengoitia:"
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "Ezarri nire profila konektatzen naizenean"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "Izengoitia:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Berriki:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -1259,18 +1480,37 @@ msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 msgid "Manage Bookmarks"
 msgstr "Talde Agenda Moldatu"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Inprimatu egoera:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Izenburua:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Gelaren Konfigurazioa"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Ezaugarriak</b>"
@@ -1280,46 +1520,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Aldaketak</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "HTTP konektatuta"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Profila Moldatu"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Izena:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Pasa_hitza:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Erabili autentifikazioa"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host-a"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Zerrendara kontaktua sartu"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "Ireki OpenPGP Enkriptazioa"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Aukerak"
+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"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Bidali"
 
@@ -1335,40 +1614,77 @@ msgstr "<b>Konfigurazio Aurreratuaren Editorea</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Ekintzak</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Bezeroak</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Arau bat editatu</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Lerroaren Formatua</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Aukerak</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Ikusizko Jakinarazketa</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Grafikoen Kontrola</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Bezeroak</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Soinuak</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Aukerak</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Debekatze Zerrenda</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Egoera Mezu Ezarriak</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Ezaugarriak</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Ikusizko Jakinarazketa</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
-msgid "A_fter nickname:"
-msgstr "Izengoitiaren on_doren:"
-
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Aurreratua"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1378,48 +1694,27 @@ msgstr ""
 "Konposatzen bakarrik\n"
 "Desaktibatuta"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Baimena _OS informazioa bidaltzeko"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:25
 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:19
-msgid "Also known as iChat style"
-msgstr "iChat estiloa bezala ere ezagutua"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Adibide bat: Egoera mezu kanpoan bezala ezarri baduzu, Gajim-ek ez dizu "
-"gehiago galdetuko egoera mezuaz kanpoan egoera ezartzean; ezarritako "
-"erabiliko da beti"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Automatikoki _Kanpoan ondoren:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Automatikoki _Ez Erabilgarri ondoren:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Autodetektatu Gajim abiarazten den bakoitzean\n"
@@ -1428,64 +1723,56 @@ msgstr ""
 "Beti XFCE4-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "B_efore nickname:"
-msgstr "Izengoitia baino l_ehen:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Txat"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Check on startup if Gajim is the _default Jabber client"
 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:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "Interfazeko kolorea eta letra konfiguratu"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "Berezko Egoera Mezuak"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:34
-msgid "Default status _iconset:"
-msgstr "Berezko egoera _ikurra:"
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Displayed Chat state noti_fications:"
-msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "E_very 5 minutes"
-msgstr "5 _minuturo"
-
-#: ../data/glade/preferences_window.glade.h:40
-msgid "Emoticons:"
-msgstr "Emoticonoak:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Gertaerak"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1495,7 +1782,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:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1505,27 +1792,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:44
-msgid ""
-"Gajim will automatically show new events by poping up the relative window"
-msgstr ""
-"Gajim-ek automatikoki gertaera berriak agertaraziko ditu hautatutako leihoan "
-
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim-ek gertaera berriez jakinaraziko dizu popup bidez pantailaren beheko "
-"eskubiko aldean"
-
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr "Sartu berri diren kontaktuez jakinaraziko dizu Gajim-ek popup bidez"
-
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1533,13 +1800,19 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Ezkutatu botoiak txat taldeko leihoan."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr ""
-"Gajim-ek bakarrik kontaktuaren ikonoa aldatuko du gertaera berri bat duenean"
+"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:50
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1547,7 +1820,18 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1555,7 +1839,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1563,105 +1847,148 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Hautatua badago, Gajim-ek berriz abiarazten duzunean zerrendako eta baita "
-"txat leihoaren pantailako lekua eta tamaina gogoraraziko dizu"
+"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
+"azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko "
-"ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
-"jarriko dira)"
+"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
+"azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
-"edo animatura eraldatuko ditu"
-
-#: ../data/glade/preferences_window.glade.h:56
-msgid "Ignore rich content in incoming messages"
-msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
+"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
+"azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:57
-msgid "Ma_nage..."
-msgstr "Mo_ldatu..."
+#: ../data/glade/preferences_window.glade.h:60
+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:58
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Inoiz\n"
-"Beti\n"
-"Kontuko\n"
-"Gaiaz"
+"Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. "
+"Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "Jakinarazi kontaktuek hau egitean: "
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "Notify on new _GMail email"
-msgstr "_Gmail-eko E-posta berri batez jakinarazi"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
+"ere jarriko du."
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "Mezu _guztietan"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko "
+"ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
+"jarriko dira)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "One message _window:"
-msgstr "M_ezu leiho bat"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Txat irteeren egoeren ja_kinarazteak:"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
+"edo animatura eraldatuko ditu"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Play _sounds"
-msgstr "Soinuak _entzun"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "Hobespenak"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "M_ezu leiho bat"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Imprimatu ordua:"
+msgid "Ma_nage..."
+msgstr "Mo_ldatu..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr "Gorde zerrendaren eta txat leihoaren _lekua eta tamaina"
+#, fuzzy
+msgid "Notifications"
+msgstr "Kontu Eraldaketa"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Orain duzun  playing _music  pista jarri egoera mezu bezala"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Jakinarazi kontaktuek hau egitean: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Ikusi _zerrendan bakarrik"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Jakinarazi kontaktuek hau egitean: "
 
 #: ../data/glade/preferences_window.glade.h:73
+msgid "Notify on new _GMail email"
+msgstr "_Gmail-eko E-posta berri batez jakinarazi"
+
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Informazio Pertsonala "
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "Soinuak _entzun"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1669,144 +1996,148 @@ 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:76
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sailkatu kontaktuak egoeraren bidez"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:85
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Berezko egoera _ikurra:"
+
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "Stalled"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "Automatikoki kanpoko egoera mezua"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "Automatikoki ez erabilgarriko egoera mezua"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "E_rabili ikonifikazioa (aka. notification area)"
-
-#: ../data/glade/preferences_window.glade.h:83
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Metodo honekin, gertaera berri bat (mezu bat, fitxero trasferentzia "
-"eskaera...) jasotzean, horiei buruz jakinaraziko zaizu. Mezu berri baten "
-"jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona batekin "
-"izan ezik izango da"
-
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "When new event is received:"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-" Rhythmbox eta Muine erreprodukzio programekin bakarrik funtzionatzen du. "
-"Erreprodukzio programa gehiagotarako, bisitatu http://trac.gajim.org/wiki/"
-"GajimAndMusicPlayer"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid "_Advanced Notifications Control..."
-msgstr "Notifikazio _Aurreratuaren Kontrola..."
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "_After time:"
-msgstr "Ordu_aren ondoren:"
-
-#: ../data/glade/preferences_window.glade.h:88
-msgid "_Before time:"
-msgstr "Ordua _baino lehen:"
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "Automatikoki _Kanpoan ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:95
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
+
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticonoak:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/glade/preferences_window.glade.h:91
-msgid "_Font:"
-msgstr "_Mota:"
-
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "_Sarrerako mezua:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Inoiz"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Jakinarazi horri buruz"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "Kanp_oan nagoeneko mezua:"
 
-#: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "_Entzun"
-
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "_Agertarazi"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/glade/preferences_window.glade.h:104
-msgid "_Sort contacts by status"
-msgstr "_Sailkatu kontaktuak egoeraren bidez"
+#: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
-msgstr "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Txat Taldean _Sartu"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Ez dago zerrendan"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutu"
 
@@ -1842,6 +2173,10 @@ msgstr "Dena"
 msgid "Allow"
 msgstr "Baimendu"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Ukatu"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1850,7 +2185,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
@@ -1890,152 +2225,180 @@ msgstr "niri egoera bidaltzeko"
 msgid "to view my status"
 msgstr "nire egoera ikustea"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Ezarri Araua</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "About"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Abatarea:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Helbidea"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Urtebetetzea:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Abatarea:"
+#: ../data/glade/vcard_information_window.glade.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:6
-msgid "Birthday:"
-msgstr "Urtebetetzea:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Hiria:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Konpainia:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Estatua:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Departamentua:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-Posta:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Helbide Gehigarria:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Familia:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Formatua: YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Bezeroak</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Emandako izena:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Web Pertsonala:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Ezarri Araua</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Bezeroak</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Izengoitia:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Erdi izena:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono Zenbakia:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Gehiago"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Baldintzak</b>"
 
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, 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:31
-msgid "Personal Info"
-msgstr "Informazio Pertsonala "
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Ezaugarriak</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefono Zenbakia:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Aldaketak</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Tokia:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Posta Kodea:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Aldaketak</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Aurreizkia izenean:"
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Eginkizuna:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "About"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Egoera:"
+msgid "Click to set your avatar"
+msgstr "Sakatu abatarea ezartzeko"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Kalea:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formatua: YYYY-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Atzizkia izenean:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Informazio Pertsonala "
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Lana"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Argitaratu"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Berridatzi"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Zer nahi duzu egin?</b>"
@@ -2048,78 +2411,128 @@ msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Ezabatu"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Bere egoera ikusteko esan"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Gehitu _Noifikazio Berezia"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Open_PGP kodea zehaztu"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Editatu _Taldeak"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Komandoa Exekutatu..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Bidali _Mezu Bakarra"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Ezabatu"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Sends custom XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Bidali _Mezu Bakarra..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Bidali _Fitxeroa"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Zerrendatik Ezabatua"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Berridatzi Kontaktua"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Berrrizenpetu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "Har_pidetza"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "bederatzi"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "K_ontua"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Kontaktua Gehitu..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Kontaktua _Sartu"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Zerbitzariaren Ezaugarriak:"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2133,51 +2546,91 @@ msgstr "Frequently Asked Questions (online)"
 msgid "Help online"
 msgstr "Online laguntza"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profila, A_batarea"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Ikusi _Zerrenda"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Edukiak"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontuak"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Zerbitzuak Aurkitu"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Aukerak"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Edukiak"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "At_era"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Bidali _Mezu Bakarra..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Ikusi"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Bilatu"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Kontaktua _Sartu"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Kontaktuaren Informazioa"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Bilatu"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "J_oan"
@@ -2186,10 +2639,6 @@ msgstr "J_oan"
 msgid "_Address:"
 msgstr "_Helbidea:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtroa:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Erregistratu honetara"
@@ -2247,11 +2696,15 @@ msgid "Au_thorize"
 msgstr "_Autorizatu"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, 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
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, 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
@@ -2262,10 +2715,31 @@ msgstr "Harpidetza Eskaria"
 msgid "_Deny"
 msgstr "_Ukatu"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Ikusi Gabeko _Gertaerak"
@@ -2278,57 +2752,73 @@ msgstr "Ikusi _Zerrenda"
 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:5
-msgid "Ask:"
-msgstr "Eskatua:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Ekintzak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Bezeroa:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Baliabidea:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Aldaketak</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Deskribapena</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Bezeroak</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Azalpenak"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Gela Konfigu_ratu"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Baliabidea:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Egoera:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Harpidetza:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Gehiago"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "Elkarrizketaren _historiala"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Abatarea:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2338,11 +2828,6 @@ msgstr "<b>Jabber Trafikoa</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Sarrera</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktibatu"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2361,15 +2846,29 @@ msgstr "_Mezua"
 msgid "_Presence"
 msgstr "_Egoera"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Lehen Izena:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Gehitu _Noifikazio Berezia"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Azken Izena:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Open_PGP kodea zehaztu"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Editatu _Taldeak"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Berrrizenpetu"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "Kontua E_ditatu"
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2379,211 +2878,416 @@ msgstr "Tokiko jid-a:"
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Baliabidea:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Egoera:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Kontua E_raldatu"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Erabili ezarritako portua:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Kontaktuaren Informazioa"
 
-#: ../src/advanced.py:57
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "Aktibatuta"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "Inaktiboa"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "Taldean"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr ""
+
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
+
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Izen Hautapena"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Balorea"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Mota"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ezer ez)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Ikusezin"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Ingelesa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Belarusian"
+msgstr "Bulgariera"
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Greziera"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "British"
+msgstr "Briton"
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperantoa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Frantsesa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Kroaziera"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiera"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Alemana"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian"
 msgstr "Norbegiera"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polakoa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugesa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brasileko Portugesa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Rusiera"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Alemaniera"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Eslovakoa"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:844
-msgid "Chats"
-msgstr "Txat-ak"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/chat_control.py:1030
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Ez dago zerrendan"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" by %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Enkriptazioa desaktibatuta"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Erabili autentifikazioa"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Erabili autentifikazioa"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat ezarritakorik"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "Enkriptazioa aktibatuta"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Azalpenak: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Erabilera: %s, testu leihoa itxi."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
+"gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Ez dago laguntza informazioa  /%s -rentzat"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "Ez dago zerrendan"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Mezu hau enkriptatua dago]"
+
+#: ../src/chat_control.py:1854
+#, 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:1545
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2591,29 +3295,2604 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s orain dago %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "logs-en datu basea sortzen"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim orain badago"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "%s direktorioa sortzen"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Kontaktuaren Informazioa"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Kontaktu Egoera Aldaketa"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Libre Hitz Egiteko"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "bederatzi"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+#, fuzzy
+msgid "Do not disturb"
+msgstr "Ez nahasi."
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Deskripzio errorea...."
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Txat Taldea Berria"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s  %(room_name)s gelatik"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "%s gelan sartu da"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Txat Taldeak"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "%s gelan zaude dagoeneko"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d mezu irakurri gabe"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Erabili D-Bus eta Notification-Daemon jakinarazketak erakusteko"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Kanpoan beste zerbaitetan egoteagatik"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Berezkoa"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Enable link-local/zeroconf messaging"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - inprimatu ordua mezuko.\n"
+"'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
+"'never' - inoiz ez inprimatu ordua."
+
+#: ../src/common/config.py:121
+#, fuzzy
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Imprimatu ordua Fuzzy Clock erabiliz. 1-tik 4-rako baloreak eman  "
+"fuzzyclocks-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, "
+"zehaztasun gutxienekoa."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Treat * / _ pairs as possible formatting characters."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+
+#: ../src/common/config.py:128
+#, fuzzy
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
+"erabiltzen bada."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
+"beste pertsona batek izengoiti berbera badu."
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Sartu * eta [n] zerrendako izenburuan?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
+"azkenetik."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
+"ICQ Client default behaviour)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "How many lines to store for Ctrl+KeyUP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
+"daiteke. "
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Txat elkarrizketen goera mezua ikusarazi txat leihoan. All, composing_only "
+"edo disabled izan daiteke. "
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
+"imprimatu x minuturo."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Galdetu leiho bat itxi baino lehen."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Jakin arazi gertaerak system trayicon-ean."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Show tabbed notebook border in chat windows?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Isteko botoila erakutsi tab-ean?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+
+#: ../src/common/config.py:219
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
+"mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
+"kontaktuaren izenaren azpian azalduko dira."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+
+#: ../src/common/config.py:229
+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 ""
+"Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
+"aldaketa egiten duenean edo/eta bere egoera mezua."
+
+#: ../src/common/config.py:230
+#, fuzzy
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"izan daiteke \"none\", \"all\" edo  \"in_and_out\". \"none\" bada, Gajim-ek "
+"ez du inprimatuko egoera lerroa txat talde batean partaide batek bere egoera "
+"edo egoera mezua aldatzean. \"all\" bada, Gajim-ek egoera guztiak "
+"inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko "
+"ditu bakarrik."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Kontaktuen atzealdeko kolorea momentuan deskonektatzen direnean."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Egia bada, mezuen berrezartzea tamaia txikian egingo dira eta ez "
+"ezarritakoan."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Ez erakutsarazi transporteen ikurrak."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "ez erakutsi zerrenda sistemako zeregin barran."
+
+#: ../src/common/config.py:238
+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 ""
+"Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak "
+"badira, make the window flash (the default behaviour in most Window "
+"Managers) when holding pending events."
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Kontrolatu leihoa mezu berri bat dagoenean.\n"
+"'always' - Leiho bakarrean jarriko dira mezu guztiak.\n"
+"'never' - Mezu bakoitzak bere leihoa izango du.\n"
+"'peracct' - Kontaktu baten mezuak leiho berera bidaliko dira.\n"
+"'pertype' - Mezu bateko gaiak(txat edo txat taldekoena adibidez) leiho "
+"konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
+"behar da."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Ezkutatu botoiak txat taldeko leihoan."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Ezkutatu banner-a txat talde leihoan"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
+
+#: ../src/common/config.py:250
+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 ""
+"Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
+"denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
+
+#: ../src/common/config.py:251
+#, fuzzy
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indentation when using merge consecutive nickame."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Bidali mezua eta itxi leihoa"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr "Txat taldeko izengoitietan erabiliko diren koloreen zerrenda"
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab go to next composing tab when none is unread."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
+"never show the dialog."
+
+#: ../src/common/config.py:256
+#, fuzzy
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Egia bada, lehentasuna negatiboa izateko aukera izango duzu. KONTUZ, "
+"lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
+"zerbitzariarengandik. "
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
+"aukeran ezarriak daude."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 workaround"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
+"file_transfer_proxies-en  fitxero transferentziarako."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP aktibatu al dago kontu honetarako?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "dena edo espazio egoera banandua"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'bai', 'ez', edo 'biak'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'bai', 'ez' edo ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Lotan"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Laster etorriko naiz"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Minutu batzuk barru berriro hemen."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Jaten"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Jaten ari naiz, utzi mezu bat beraz."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Filmea"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Filma bat ikustean ari naiz."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Lanean"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Lanean ari naiz."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefonoa"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Telefonoan nago."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "kanpoan"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Kanpoan naiz bizitza disfrutatzen."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Libre."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Libre Hitz Egiteko."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Be right back."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Ez Erabilgarri."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Ez nahasi."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Agur!"
+
+#: ../src/common/config.py:441
+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 ""
+"Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
+"gela bateko mezu batek zure izengoitia duenean."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "berdea"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "grocery"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "gizakia"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "arrantzale"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Ez izan da idle modulua kargatu"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Host okerra"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Gehigarriak ez eskuragarri"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Baimenik gabeko izengoitia: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Ezin da gela honetara sartu"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Gela honetan ukatua izan zara."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Honako gela honek ez du existitzen."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Gela sortzea mugatua dago."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Erregistratutako izengoitia erabilia izan behar da."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Ez zaude kideen zerrendan."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Autorizazioa ezabatua izan da."
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Nire zerrendara gehitu nahi zaitut."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "%s -ra harpidetuak gaude orain"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Harpidetza kentzekoa eskaera %s -tik"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "%s -ren harpidetzatik kenduta gaude"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP pasa-esaldia ez da eman"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "%s konektatu behar zara OpenPGP-rik gabe."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Ez izan da idle modulua kargatu"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Baliogabeko izena"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "\"%s\" kontuarekin konexioa galdu da"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Manualki konektatu berriro."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "D-Bus bertsioa aurkitugabea: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Erantzun baliogabea"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Konexioak huts egin du"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Ezin izan da konektatu \"%s\" -rekin"
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Ezin izan da konektatu \"%s\" -rekin"
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "\"%s\" kontuarekin konexioa galdu da"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "D-Bus bertsioa aurkitugabea: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Begira ezazu zure konexioa edo saiatu berriro"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "\"%s\" -rekin autentifikazioak huts egin du"
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "Errorea zerbitzarian sartzean.%s"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Gaia: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Ez bidali ikusezin egoerarengatik"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Begiratzaileak"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transportea"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "Ez dago zerrendan"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindings are missing in this computer"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Kontu izena ezin da hustu."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Bus saioa ez dago erabilgarri.\n"
+"Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "bat"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "bi"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "hiru"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "lau"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "bost"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "sei"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "zazpi"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "zortzi"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "bederatzi"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "Hamar"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "hamaika"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "Hamabi"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "$0 o'clock"
+msgstr "%0 o'clock"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "five past $0"
+msgstr "%0 eta bost"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "&0 eta hamar"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "quarter past $0"
+msgstr "%0 eta laurden"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty past $0"
+msgstr "%0 eta hogei"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty five past $0"
+msgstr "%0 eta hogeita bost"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "half past $0"
+msgstr "%0 eta erdiak"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "%1 hogeita bost gutxi "
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "%1 hogei gutxi"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "%1 laurden gutxi"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "%1 -tik hamarrera"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "%1 bost gutxi"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#, fuzzy
+msgid "$1 o'clock"
+msgstr "%1 ordu batak"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Gaua"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Goizaldea"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Goiza"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Eguerdia"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Eguerdia"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Arratsaldea"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Arratsaldea"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Ilunabarra"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Aste hasiera"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Aste erdia"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Aste bukaera"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Asteburua!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Baliogabeko karakterea izenean."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Zerbitzariaren helbidea behar da."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Baliogabeko karakterea hostname -ean."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Invalid character in resource."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s Gib"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "Lan_petuta"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Lanpetuta"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "Ez E_rabilgarri"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "Libre _Hitz Egiteko"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Libre Hitz Egiteko"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Libre"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Libre"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Konektatzen"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Kanpoan"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Deskonektatuta"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Deskonektatuta"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "Ikuse_zin"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Ezin da jakin"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Errorea du"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Inork ez"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Norentzat"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Biak"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Inork ez"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Inor ez"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderatzaileak"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderatzailea"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Partaideak"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Partaidea"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Bisitariak"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Bisitaria"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Inor ez"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Jabea"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administratzailea"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Partaidea"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "arreta jartzen ari da elkarrizketara"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "beste zerbait egiten ari da"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "mezu bat sortzen ari da..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "mezuaren sorrera gelditua"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "tab edo lehioa itxi egin du"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Bidali mezua"
+msgstr[1] "Bidali mezua"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "errorea: ezin da %s ireki irakurtzeko"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "migrating logs database to indeces"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "%s gajim kontua"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Etena"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Negrita"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "daukadanean"
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Txat-ak"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Negrita"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Edukiak"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Osatua"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Edukiak"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Inaktiboa"
+
+#: ../src/common/pep.py:49
+msgid "Curious"
+msgstr ""
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Ezabatu"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
 msgstr "Ezindu"
 
-#: ../src/config.py:221
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Ezindu"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Ezindu"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Taldea"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Host-a"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "mezua"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Ikusezin"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "bat"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host-a"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Alemaniera"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Eraldatu"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Deskonektatuta"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Taldea"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "hamaika"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Stalled"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Azken Eraldaketa:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Izengoitia"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Lotan"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Kalea:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Harpidetu"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Denbora"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "bederatzi"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Host okerra"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Arratsaldea"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Sortzen"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Goiza"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "talde hontakoak"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Lanean"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Arratsaldea"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Botatzen %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Sartu"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Lanean"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Lanean"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Jaten"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Gaia Aldatu"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Botatzen %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Jaten"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Lanean"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Botatzen %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Jaten"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Deskonektatuta"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Jaten"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Arrazoia"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Arrazoia"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Lotan"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Lanean"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Jaten"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Filma bat ikustean ari naiz."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Jaten"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Telefonoan nago."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Tranferitzen"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Sortzen"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Ireki _lotura bezala"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Lanean"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Sortzen"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Lanean"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Unable to bind to port %s."
+
+#: ../src/common/socks5.py:85
+#, fuzzy
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia "
+"bertan behera utziko da."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahi error"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "%s _minuturo"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-local messaging might not work properly."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Ezin izan da zerbitzu lokalak hasi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Unable to bind to port %d."
 
-#: ../src/config.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Mezu hau enkriptatua dago]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Errorea zerbitzarian sartzean.%s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Ezindu"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Berezko Egoera Mezuak"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Aktibatu"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Bezeroak</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2622,73 +5901,109 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:1074
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Jasotako Hurrengo Mezua"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Izena"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Birkargatu orain?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Irakurri gabeko gertaerak"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr ""
+"Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Txat-a %s kontuan ireki duzu"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr "Irakurri gabeko gertaerak"
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 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:1344
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2696,175 +6011,147 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Kontuak moldatu"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Sartu %s taldearentzat izen berri bat"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr "Be right back."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr "Birkargatu orain?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1566
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Aukeratu zure OpenPGP kodea"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 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:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Kode sekretua lortzeko huts egitea"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
-
-#: ../src/config.py:1634 ../src/config.py:3427
-msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Giltzaren Aukera"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Aukeratu zure OpenPGP kodea"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Izena"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Zerbitzaria"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr ""
-"Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
-
-#: ../src/config.py:1969
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Txat-a %s kontuan ireki duzu"
-
-#: ../src/config.py:1970
-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:2029
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 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:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2872,11 +6159,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2884,23 +6171,24 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
+#, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2908,7 +6196,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2924,367 +6212,485 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Denak"
+
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2749
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
 "talde agenda hau ezabatzeaz"
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "Pasahitz baliogabea"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "Pasahitzak desberdinak dira"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "Bi lekuetan pasahitza berdina izan behar du."
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Bikoiztutako Jabber ID "
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3100
-msgid "Your new account has been created successfully"
-msgstr "Zure kontu berria egoki sortua izan da."
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kontaktua jadanik badago zerrendan"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Zure kontu berria egoki sortua izan da."
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "IM Jabber Bezeroa"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Ezarri MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Egoera Mezua"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
+"beste izen bat."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Hebidea:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG zenbakia:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ zanbakia:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Helbidea:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Helbide:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Mesedez ezarri sartu nahi duzun kontaktuaren informazioa %s kontuarako"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Nire zerrendara gehitu nahi zaitut."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:906
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
+"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 ""
-"Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia "
-"bertan behera utziko da."
+"%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
+"hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 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:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Baliogabeko izena"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "ID Jabber gelak ez du onartzen karaktererik."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Zerbitzaria"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "\"%s\"  kontua zerbitzarira konektatu da"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3293,269 +6699,376 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Pasahitz baliogabea"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Pasahitzak desberdinak dira"
+
+#: ../src/dialogs.py:2025
+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:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:1887
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, 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:1890
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
-#, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Gela honetan ukatua izan zara."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
+
+#: ../src/dialogs.py:2968
+#, 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"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "nagoenean"
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Besteak"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transportea"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3563,206 +7076,469 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Baliogabeko izena"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Komandoa Exekutatu..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ezer ez"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Historial Administratzailea"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Mezua Bidaltzean"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Ireki OpenPGP Enkriptazioa"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Sarrerako mezua:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Orokorra"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Zerbitzariaren Ezaugarriak:"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Fitxeroa"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Denbora"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Zu"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Hartzailea: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "Fitxero transferentzia gelditua beste kontaktuarengatik"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Deskribapena: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Gorde Bezala..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3770,60 +7546,70 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ rutinak ez du libglade sostengatzen"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3831,20 +7617,20 @@ msgid ""
 msgstr ""
 "GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 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:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim-ek  pywin32  behar du abiarazteko"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3854,11 +7640,11 @@ msgstr ""
 "dezakezu hau."
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3866,213 +7652,442 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Pasa-esaldia Behar da"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Pasa-esaldi okerra"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
+"Mesedez ezarri beste izengoiti bat:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Baimen hau onartzen al duzu?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/gajim.py:706
-#, python-format
-msgid "Subject: %s"
-msgstr "Gaia: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "Beti deskonektatuta ikusiko duzu."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s orain %s dago: (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "Zure pasa-esaldia ez da egokia"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Pasahitza behar da gela honetan sartzeko."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Zure pasa-esaldia ez da egokia"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Norengandik: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Mezu _guztietan"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Erabiltze izenarekin gatazka"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Konektatu"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "E_z galdetu berriro  "
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Enkriptazioa desaktibatuta"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gajim.py:2090
-msgid "Network Manager support not available"
-msgstr "Network Kudeatzailea ez dago erabilgarri"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Talde agenda ezarria"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management support not available (missing gnome.ui module)"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "\"%s\" gela zure talde agendan dago jadanik."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Talde agenda egoki sortu da"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:78
-msgid "Popups a window with the next pending event"
+#: ../src/gajim-remote.py:91
+#, fuzzy
+msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "kontua"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "egoera"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "mezua"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4081,19 +8096,19 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 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 "
@@ -4103,27 +8118,29 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp giltza"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 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 "
@@ -4133,137 +8150,212 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "Mezua jaso dugun kontuaren JID-a"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Zerrendara kontaktua sartu"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Sartu kontaktu berria kontu honetara"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Oraingo egoera mezua itzuli (Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:214
-msgid "Returns number of unreaded messages"
+#: ../src/gajim-remote.py:238
+#, fuzzy
+msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ireki  'Txat-a Hasi' leiho"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Elkarrizketa hasi, kontu hau rabiliz"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Gela Berri Sartu"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "-etik"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Gela:"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "Izengoitia"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Izengoitia aurkitugabea: %s"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "Pasahitza:"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Pasahitzak desberdinak dira"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4272,29 +8364,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:335
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4303,142 +8397,201 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:420
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
+
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
+msgid ""
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host okerra"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Gaia"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Ezin duzu zure berezko gaia ezabatu"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "gaiaren izena"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Ezin duzu zure berezko gaia ezabatu"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Txat Pribatua"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Txat Pribatuak"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:144
-msgid "Group Chat"
-msgstr "Txat Taldea"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Txat Taldeak"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Elkarrizketaren Historiala"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Konektatu"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Zure kontu berria egoki sortua izan da."
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, 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:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Afizioak: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s orain %s bezala ezaguna da"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, 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:936
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s orain %s da"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Baliogabeko izena"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Gela honek ez du gairik"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s ez du ematen baliozko JID bat denik"
-
-#: ../src/groupchat_control.py:1227
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Azalpenak: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4451,32 +8604,23 @@ msgstr ""
 "beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango "
 "da ere. Izengoitiak EZ du onartzen tarterik. "
 
-#: ../src/groupchat_control.py:1259
-#, python-format
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr ""
 "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Erabilera: %s, testu leihoa itxi."
-
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
 
-#: ../src/groupchat_control.py:1268
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
-
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4485,7 +8629,7 @@ msgstr ""
 "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
 "arrazoi bat emanez. "
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4494,7 +8638,7 @@ msgstr ""
 "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
 "aukeraz izengoiti bat ezarriz."
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4505,121 +8649,101 @@ msgstr ""
 "erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
 "espazioak iznegoitian."
 
-#: ../src/groupchat_control.py:1284
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
-"gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
-
-#: ../src/groupchat_control.py:1288
-#, python-format
+#: ../src/groupchat_control.py:1692
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
 "bidali zehaztutako izengoitiaren erabiltzailera."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ez dago laguntza informazioa  /%s -rentzat"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, 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:1358
+#: ../src/groupchat_control.py:1839
 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:1362 ../src/roster_window.py:3962
-msgid "Do _not ask me again"
-msgstr "E_z galdetu berriro  "
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "Talde agenda ezarria"
-
-#: ../src/groupchat_control.py:1433
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "\"%s\" gela zure talde agendan dago jadanik."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "Talde agenda egoki sortu da"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-msgid "You can manage your bookmarks via Actions menu in your roster."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
 msgstr ""
-"Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Programazio errore bat detektatu da"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4627,84 +8751,97 @@ msgstr ""
 "Seguraski ez da garrantzitsua, baina diseinatzailei abisatu beharko "
 "litzateke."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Zehaztapenak"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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."
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+msgid "Gajim is not the default Jabber client"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:734
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, 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:738
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontaktua"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Izengoitia"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 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:188
+#: ../src/history_manager.py:226
 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 "
@@ -4718,140 +8855,176 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s orain dago %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Ezin izan da irudia kargatu"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Txat-ak"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Txat Taldeak"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Txat Pribatuak"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Mezu Pribatu Berri Bat %s gelatik"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mezu Berria %(nickname)s -etik"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Orokorra"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr "Sakatu abatarea ezartzeko"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Fitxeroaren tokia"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Honako gela honek ez du existitzen."
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informazioa jasoa"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Profila bidaltzen..."
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr "Informazio argitaratua"
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informazio EZ argitaratua"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4859,212 +9032,152 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Begiratzaileak"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Autorizazioa bidalia izan da"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "%s kontua erabiliz "
+msgid "Now \"%s\" will know your status."
+msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
-#, python-format
-msgid "to %s account"
-msgstr "%s kontura"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Harpidetza eskaria bidalia izan da"
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "%s kontua erabiliz"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#. profile, avatar
-#: ../src/roster_window.py:983
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Autorizazioa ezabatua izan da."
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "%s kontukoa"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1003
-msgid "_Manage Bookmarks..."
-msgstr "Talde Agenda _Moldatu..."
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "%s konturako"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1053
-msgid "History Manager"
-msgstr "Historial Administratzailea"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:1062
-msgid "_Join New Group Chat"
-msgstr "T_xat Talde Berrian Sartu"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
+"honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
+
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:1393
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, 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:1478
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-msgid "_New group chat"
-msgstr "T_xat Talde Berria"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "Nire zerrendara nahi nizuke sartu"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-msgid "Send Group M_essage"
-msgstr "_Bidali Taldeari Mezua"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "_Berrizenpetu"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr "Kontaktu guztiei"
-
-#: ../src/roster_window.py:2061
-msgid "To all online users"
-msgstr "Konektatutako kontaktu guztiei"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "_Log aktibatua"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "Log _desaktibatua"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "_Egoera Mezua aldatu"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "Autorizazioa bidalia izan da"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Orain \"%s\"-ak jakingo du zure egoera."
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "Harpidetza eskaria bidalia izan da"
-
-#: ../src/roster_window.py:2394
-#, 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:2406
-msgid "Authorization has been removed"
-msgstr "Autorizazioa ezabatua izan da."
-
-#: ../src/roster_window.py:2407
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
-
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5072,7 +9185,13 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Zer nahi duzu egitea?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5080,16 +9199,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:3144
 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:2631
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5099,87 +9218,37 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "%s konektatu behar zara OpenPGP-rik gabe."
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "Pasa-esaldia Behar da"
-
-#: ../src/roster_window.py:2711
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Gorde pasa-esaldia"
-
-#: ../src/roster_window.py:2724
-msgid "Wrong Passphrase"
-msgstr "Pasa-esaldi okerra"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-msgid "You are participating in one or more group chats"
-msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
-
-#: ../src/roster_window.py:2783 ../src/roster_window.py:2843
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
-"honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
-
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 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:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" by %(artist)s"
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3956
+#: ../src/roster_window.py:3784
 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:3958
+#: ../src/roster_window.py:3786
+#, fuzzy
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"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 ""
@@ -5187,110 +9256,321 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Fitxero Baliogabea"
+
+#: ../src/roster_window.py:3910
+#, 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:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Bidali %s taldea %s-era"
+msgid "using account %s"
+msgstr "%s kontua erabiliz "
 
-#: ../src/roster_window.py:4132
+#. add
+#: ../src/roster_window.py:4674
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Egin %s eta %s metacontacts"
+msgid "to %s account"
+msgstr "%s kontura"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "%s kontua erabiliz"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "Talde Agenda _Moldatu..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "%s kontukoa"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "%s konturako"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Egoera Mezua aldatu"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Argitaratu"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Aktibatuta"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Zerbitzuak Aurkitu..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "_Bidali Taldeari Mezua"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Kontaktu guztiei"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Konektatutako kontaktu guztiei"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Nire zerrendara nahi nizuke sartu"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:4319
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Bidali Mezu Bakarra"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportea"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Trans_porteak Erakutsi"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontaktua Deskonektatuta"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Txat Taldea Berria"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Historial Administratzailea"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "T_xat Talde Berrian Sartu"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Gaia: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Azken egoera: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " %s-etik"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Konektatu"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontaktua Deskonektatuta"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Gela:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Aktibatuta"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Mota:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Gelditua"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5298,24 +9578,25 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Afizioak: "
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Aplikazioak</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5323,7 +9604,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5331,1302 +9612,447 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr "baliabidea lehentasunarekin: "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "logs-en datu basea sortzen"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim orain badago"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "%s direktorioa sortzen"
-
-#: ../src/common/config.py:55
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Erabili D-Bus eta Notification-Daemon jakinarazketak erakusteko"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "Kanpoan beste zerbaitetan egoteagatik"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
-
-#: ../src/common/config.py:82
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Enable link-local/zeroconf messaging"
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'always' - inprimatu ordua mezuko.\n"
-"'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
-"'never' - inoiz ez inprimatu ordua."
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"Imprimatu ordua Fuzzy Clock erabiliz. 1-tik 4-rako baloreak eman  "
-"fuzzyclocks-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, "
-"zehaztasun gutxienekoa."
-
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Treat * / _ pairs as possible formatting characters."
-
-#: ../src/common/config.py:96
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
-"erabiltzen bada."
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
-"beste pertsona batek izengoiti berbera badu."
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Sartu * eta [n] zerrendako izenburuan?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
-"azkenetik."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
-"ICQ Client default behaviour)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "How many lines to store for Ctrl+KeyUP."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
-
-#: ../src/common/config.py:154
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
-"daiteke. "
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Txat elkarrizketen goera mezua ikusarazi txat leihoan. All, composing_only "
-"edo disabled izan daiteke. "
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
-"imprimatu x minuturo."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Galdetu leiho bat itxi baino lehen."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Jakin arazi gertaerak system trayicon-ean."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Show tabbed notebook border in chat windows?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Isteko botoila erakutsi tab-ean?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-
-#: ../src/common/config.py:190
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
-"mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
-"kontaktuaren izenaren azpian azalduko dira."
-
-#: ../src/common/config.py:195
-msgid ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-msgstr ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-
-#: ../src/common/config.py:196
-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 ""
-"Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
-"aldaketa egiten duenean edo/eta bere egoera mezua."
-
-#: ../src/common/config.py:197
-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 ""
-"izan daiteke \"none\", \"all\" edo  \"in_and_out\". \"none\" bada, Gajim-ek "
-"ez du inprimatuko egoera lerroa txat talde batean partaide batek bere egoera "
-"edo egoera mezua aldatzean. \"all\" bada, Gajim-ek egoera guztiak "
-"inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko "
-"ditu bakarrik."
-
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr "Kontaktuen atzealdeko kolorea momentuan deskonektatzen direnean."
-
-#: ../src/common/config.py:202
-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:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Ez erakutsarazi transporteen ikurrak."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "ez erakutsi zerrenda sistemako zeregin barran."
-
-#: ../src/common/config.py:205
-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 ""
-"Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak "
-"badira, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
-
-#: ../src/common/config.py:207
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Kontrolatu leihoa mezu berri bat dagoenean.\n"
-"'always' - Leiho bakarrean jarriko dira mezu guztiak.\n"
-"'never' - Mezu bakoitzak bere leihoa izango du.\n"
-"'peracct' - Kontaktu baten mezuak leiho berera bidaliko dira.\n"
-"'pertype' - Mezu bateko gaiak(txat edo txat taldekoena adibidez) leiho "
-"konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
-"behar da."
-
-#: ../src/common/config.py:211
-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:212
-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:213
-msgid "Hides the buttons in group chat window."
-msgstr "Ezkutatu botoiak txat taldeko leihoan."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Ezkutatu botoilak bi pertsonen txat leihoan. "
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Ezkutatu banner-a txat talde leihoan"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
-
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
-
-#: ../src/common/config.py:218
-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 ""
-"Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
-"denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
-
-#: ../src/common/config.py:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr "Indentation when using merge consecutive nickame."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Txat taldeko izengoitietan erabiliko diren koloreen zerrenda"
-
-#: ../src/common/config.py:221
-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:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
-"never show the dialog."
-
-#: ../src/common/config.py:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"Egia bada, lehentasuna negatiboa izateko aukera izango duzu. KONTUZ, "
-"lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
-"zerbitzariarengandik. "
-
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
-"aukeran ezarriak daude."
-
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 workaround"
-
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
-"file_transfer_proxies-en  fitxero transferentziarako."
-
-#: ../src/common/config.py:326
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "OpenPGP aktibatu al dago kontu honetarako?"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-msgid "Language for which we want to check misspelled words"
-msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
-
-#: ../src/common/config.py:336
-msgid "all or space separated status"
-msgstr "dena edo espazio egoera banandua"
-
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr "'bai', 'ez', edo 'biak'"
-
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr "'bai', 'ez' edo ''"
-
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "Lotan"
-
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "Laster etorriko naiz"
-
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "Minutu batzuk barru berriro hemen."
-
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "Jaten"
-
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "Jaten ari naiz, utzi mezu bat beraz."
-
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "Filmea"
-
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "Filma bat ikustean ari naiz."
-
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "Lanean"
-
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "Lanean ari naiz."
-
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "Telefonoa"
-
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "Telefonoan nago."
-
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "kanpoan"
-
-#: ../src/common/config.py:357
-msgid "I'm out enjoying life."
-msgstr "Kanpoan naiz bizitza disfrutatzen."
-
-#: ../src/common/config.py:361
-msgid "I'm available."
-msgstr "Libre."
-
-#: ../src/common/config.py:362
-msgid "I'm free for chat."
-msgstr "Libre Hitz Egiteko."
-
-#: ../src/common/config.py:364
-msgid "I'm not available."
-msgstr "Ez Erabilgarri."
-
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr "Ez nahasi."
-
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr "Agur!"
-
-#: ../src/common/config.py:376
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 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:377
-msgid "Sound to play when any MUC message arrives."
-msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
-
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "berdea"
-
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr "grocery"
 
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "gizakia"
-
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "arrantzale"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Ez izan da idle modulua kargatu"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Host okerra"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-
-#: ../src/common/connection_handlers.py:590
-#, 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:1523
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Baimenik gabeko izengoitia: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
-msgid "Unable to join group chat"
-msgstr "Ezin da gela honetara sartu"
-
-#: ../src/common/connection_handlers.py:1586
-msgid "A password is required to join this group chat."
-msgstr "Pasahitza behar da gela honetan sartzeko."
-
-#: ../src/common/connection_handlers.py:1589
-msgid "You are banned from this group chat."
-msgstr "Gela honetan ukatua izan zara."
-
-#: ../src/common/connection_handlers.py:1592
-msgid "Such group chat does not exist."
-msgstr "Honako gela honek ez du existitzen."
-
-#: ../src/common/connection_handlers.py:1595
-msgid "Group chat creation is restricted."
-msgstr "Gela sortzea mugatua dago."
-
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "Erregistratutako izengoitia erabilia izan behar da."
-
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "Ez zaude kideen zerrendan."
-
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
-"Mesedez ezarri beste izengoiti bat:"
-
-#: ../src/common/connection_handlers.py:1659
-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:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "%s -ra harpidetuak gaude orain"
-
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Harpidetza kentzekoa eskaera %s -tik"
-
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s -ren harpidetzatik kenduta gaude"
-
-#: ../src/common/connection_handlers.py:1854
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "\"%s\" kontuarekin konexioa galdu da"
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Manualki konektatu berriro."
-
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Erantzun baliogabea"
-
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Ezin izan da konektatu \"%s\" -rekin"
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "%s zerbitzarira konektatu: %s %s -ekin"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Begira ezazu zure konexioa edo saiatu berriro"
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "\"%s\" -rekin autentifikazioak huts egin du"
-
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP pasa-esaldia ez da eman"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "ikusezin"
-
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "deskonektatuta"
-
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "%s naiz"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
-
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Gaia: %s\n"
-"%s"
-
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr "Ez bidali ikusezin egoerarengatik"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-
-#: ../src/common/exceptions.py:30
-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:38
-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:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Bus saioa ez dago erabilgarri.\n"
-"Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr "baliabidea lehentasunarekin: "
 
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "bat"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "bi"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat ezarritakorik"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "hiru"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "No such command: /%s (if you want to send this, prefix it with /say)"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "lau"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
+#~ "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "bost"
+#~ msgid "Encryption enabled"
+#~ msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "sei"
+#~ msgid "Encryption disabled"
+#~ msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "zazpi"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Berridatzi Pasahitza"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "zortzi"
+#~ msgid "_Use proxy"
+#~ msgstr "_Proxy erabili"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "bederatzi"
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Aukeratuta badago, Bonnjour-ekin bateragarriak diren txat programak "
+#~ "(iChat, Trillian edota Gaim bezalakoak) erabiltzen duten kontaktu guztiak "
+#~ "azal araziko dira zerrendan. Ez duzu jabber zerbitzari batera konektatu "
+#~ "egon beharrik funtziona dezan.\n"
+#~ "Hau erabilgarri izango da python-avahi instalatuta baldin badago eta "
+#~ "avahi-daemon funtzionamenduan  badago. "
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "Hamar"
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek "
+#~ "kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "hamaika"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Enable link-local messaging"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "Hamabi"
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr "%0 o'clock"
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo eta Juliet</small>"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr "%0 eta bost"
+#~ msgid "Old stories"
+#~ msgstr "Old stories"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr "&0 eta hamar"
+#~ msgid "Soliloquy"
+#~ msgstr "Soliloquy"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr "%0 eta laurden"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr "%0 eta hogei"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Bista trikoa        Alt+C"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr "%0 eta hogeita bost"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Sakatu gela honetako elkarrizketa zaharrak ikusteko"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr "%0 eta erdiak"
+#~ msgid "Build custom query"
+#~ msgstr "Build custom query"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr "%1 hogeita bost gutxi "
+#~ msgid "Query Builder..."
+#~ msgstr "Query Builder..."
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr "%1 hogei gutxi"
+#~ msgid "Accept"
+#~ msgstr "Onartu"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr "%1 laurden gutxi"
+#~ msgid "Invitation Received"
+#~ msgstr "Gonbidapena Jasoa"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "ten to %1"
-msgstr "%1 -tik hamarrera"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Lerroaren Formatua</b>"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr "%1 bost gutxi"
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Grafikoen Kontrola</b>"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr "%1 ordu batak"
+#~ msgid "A_fter nickname:"
+#~ msgstr "Izengoitiaren on_doren:"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr "Gaua"
+#~ msgid "Also known as iChat style"
+#~ msgstr "iChat estiloa bezala ere ezagutua"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr "Goizaldea"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Adibide bat: Egoera mezu kanpoan bezala ezarri baduzu, Gajim-ek ez dizu "
+#~ "gehiago galdetuko egoera mezuaz kanpoan egoera ezartzean; ezarritako "
+#~ "erabiliko da beti"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Morning"
-msgstr "Goiza"
+#~ msgid "B_efore nickname:"
+#~ msgstr "Izengoitia baino l_ehen:"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr "Eguerdia"
+#~ msgid "Chat"
+#~ msgstr "Txat"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Noon"
-msgstr "Eguerdia"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "5 _minuturo"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr "Arratsaldea"
+#~ msgid "Events"
+#~ msgstr "Gertaerak"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Evening"
-msgstr "Arratsaldea"
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr ""
+#~ "Gajim-ek automatikoki gertaera berriak agertaraziko ditu hautatutako "
+#~ "leihoan "
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr "Ilunabarra"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim-ek gertaera berriez jakinaraziko dizu popup bidez pantailaren "
+#~ "beheko eskubiko aldean"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr "Aste hasiera"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr "Sartu berri diren kontaktuez jakinaraziko dizu Gajim-ek popup bidez"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr "Aste erdia"
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim-ek bakarrik kontaktuaren ikonoa aldatuko du gertaera berri bat "
+#~ "duenean"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr "Aste bukaera"
+#~ 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 ""
+#~ "Hautatua badago, Gajim-ek berriz abiarazten duzunean zerrendako eta baita "
+#~ "txat leihoaren pantailako lekua eta tamaina gogoraraziko dizu"
 
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr "Asteburua!"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Inoiz\n"
+#~ "Beti\n"
+#~ "Kontuko\n"
+#~ "Gaiaz"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Baliogabeko karakterea izenean."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Txat irteeren egoeren ja_kinarazteak:"
 
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Zerbitzariaren helbidea behar da."
+#~ msgid "Print time:"
+#~ msgstr "Imprimatu ordua:"
 
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Baliogabeko karakterea hostname -ean."
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Gorde zerrendaren eta txat leihoaren _lekua eta tamaina"
 
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Invalid character in resource."
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Orain duzun  playing _music  pista jarri egoera mezu bezala"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s Gib"
+#~ msgid "Show only in _roster"
+#~ msgstr "Ikusi _zerrendan bakarrik"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "The auto away status message"
+#~ msgstr "Automatikoki kanpoko egoera mezua"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "The auto not available status message"
+#~ msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Metodo honekin, gertaera berri bat (mezu bat, fitxero trasferentzia "
+#~ "eskaera...) jasotzean, horiei buruz jakinaraziko zaizu. Mezu berri baten "
+#~ "jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona batekin "
+#~ "izan ezik izango da"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ " Rhythmbox eta Muine erreprodukzio programekin bakarrik funtzionatzen du. "
+#~ "Erreprodukzio programa gehiagotarako, bisitatu http://trac.gajim.org/wiki/"
+#~ "GajimAndMusicPlayer"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Notifikazio _Aurreratuaren Kontrola..."
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "Lan_petuta"
+#~ msgid "_After time:"
+#~ msgstr "Ordu_aren ondoren:"
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Lanpetuta"
+#~ msgid "_Before time:"
+#~ msgstr "Ordua _baino lehen:"
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "Ez E_rabilgarri"
+#~ msgid "_Font:"
+#~ msgstr "_Mota:"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "Libre _Hitz Egiteko"
+#~ msgid "_Never"
+#~ msgstr "_Inoiz"
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Libre Hitz Egiteko"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Jakinarazi horri buruz"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Libre"
+#~ msgid "_Player:"
+#~ msgstr "_Entzun"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Libre"
+#~ msgid "_Pop it up"
+#~ msgstr "_Agertarazi"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Konektatzen"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "_Kanpoan"
+#~ msgid "Address"
+#~ msgstr "Helbidea"
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Deskonektatuta"
+#~ msgid "City:"
+#~ msgstr "Hiria:"
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Deskonektatuta"
+#~ msgid "Company:"
+#~ msgstr "Konpainia:"
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "Ikuse_zin"
+#~ msgid "Country:"
+#~ msgstr "Estatua:"
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "Ezin da jakin"
+#~ msgid "Given:"
+#~ msgstr "Emandako izena:"
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "Errorea du"
+#~ msgid "Middle:"
+#~ msgstr "Erdi izena:"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "Inork ez"
+#~ msgid "Position:"
+#~ msgstr "Tokia:"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Norentzat"
+#~ msgid "Prefix:"
+#~ msgstr "Aurreizkia izenean:"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Biak"
+#~ msgid "Role:"
+#~ msgstr "Eginkizuna:"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "Inork ez"
+#~ msgid "State:"
+#~ msgstr "Egoera:"
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Harpidetu"
+#~ msgid "Suffix:"
+#~ msgstr "Atzizkia izenean:"
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "Inor ez"
+#~ msgid "_Retrieve"
+#~ msgstr "_Berridatzi"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Moderatzaileak"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Zerrendatik Ezabatua"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Moderatzailea"
+#~ msgid "A_ccounts"
+#~ msgstr "K_ontua"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Partaideak"
+#~ msgid "_Filter:"
+#~ msgstr "_Filtroa:"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Partaidea"
+#~ msgid "Ask:"
+#~ msgstr "Eskatua:"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Bisitariak"
+#~ msgid "Client:"
+#~ msgstr "Bezeroa:"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Bisitaria"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Inor ez"
+#~ msgid "Subscription:"
+#~ msgstr "Harpidetza:"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Jabea"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Administratzailea"
+#~ msgid "Every %s _minutes"
+#~ msgstr "%s _minuturo"
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Partaidea"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "arreta jartzen ari da elkarrizketara"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Beti deskonektatuta ikusiko duzu."
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "beste zerbait egiten ari da"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s orain %s dago: (%s)"
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "mezu bat sortzen ari da..."
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Norengandik: %(from_address)s"
 
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "mezuaren sorrera gelditua"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Kudeatzailea ez dago erabilgarri"
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "tab edo lehioa itxi egin du"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Session Management support not available (missing gnome.ui module)"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d mezu irakurri gabe"
-msgstr[1] "%d mezu irakurri gabe"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d mezu irakurri gabe"
-msgstr[1] "%d irakurri gabeko mezuak"
+#~ msgid "Private Chat"
+#~ msgstr "Txat Pribatua"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d  txat taldeko mezua irakurri gabe"
-msgstr[1] "%d txat taldeko mezuak irakurri gabe"
+#~ msgid "Group Chat"
+#~ msgstr "Txat Taldea"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d mezu pribatu irakurri gabe"
-msgstr[1] "%d mezu pribatu irakurri gabe"
+#~ msgid "%s is now %s"
+#~ msgstr "%s orain %s da"
 
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s ez du ematen baliozko JID bat denik"
 
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "errorea: ezin da %s ireki irakurtzeko"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "Information published"
+#~ msgstr "Informazio argitaratua"
 
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr "cyan"
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
 
-#: ../src/common/optparser.py:302
-msgid "migrating logs database to indeces"
-msgstr "migrating logs database to indeces"
+#~ msgid "_New group chat"
+#~ msgstr "T_xat Talde Berria"
 
-#: ../src/common/passwords.py:86
-#, python-format
-msgid "Gajim account %s"
-msgstr "%s gajim kontua"
+#~ msgid "_Log on"
+#~ msgstr "_Log aktibatua"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"Host-era konexioa ezin izan da ezarri. Zerbitzariaren erantzuna ez da egokia "
-"izan. "
+#~ msgid "Log _off"
+#~ msgstr "Log _desaktibatua"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Hots-eko konexioa ezin izan da ezarri"
+#~ msgid "Save passphrase"
+#~ msgstr "Gorde pasa-esaldia"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Bidali %s taldea %s-era"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Egin %s eta %s metacontacts"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
+#~ msgid "Affiliation:"
+#~ msgstr "Afizioak: "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Avahi error"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Ezkutatu botoilak bi pertsonen txat leihoan. "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Link-local messaging might not work properly."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "%s zerbitzarira konektatu: %s %s -ekin"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
+#~ msgid "invisible"
+#~ msgstr "ikusezin"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Ezin izan da zerbitzu lokalak hasi"
+#~ msgid "offline"
+#~ msgstr "deskonektatuta"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Unable to bind to port %d."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d mezu irakurri gabe"
+#~ msgstr[1] "%d irakurri gabeko mezuak"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d  txat taldeko mezua irakurri gabe"
+#~ msgstr[1] "%d txat taldeko mezuak irakurri gabe"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d mezu pribatu irakurri gabe"
+#~ msgstr[1] "%d mezu pribatu irakurri gabe"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Mezu hau enkriptatua dago]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Host-era konexioa ezin izan da ezarri. Zerbitzariaren erantzuna ez da "
+#~ "egokia izan. "
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Errorea zerbitzarian sartzean.%s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Hots-eko konexioa ezin izan da ezarri"
 
 #~ msgid "This is result of query."
 #~ msgstr "This is result of query."
@@ -6640,9 +10066,6 @@ msgstr "Errorea zerbitzarian sartzean.%s"
 #~ msgid "Role: "
 #~ msgstr "Eginkizun:"
 
-#~ msgid "Affiliation: "
-#~ msgstr "Afizioak: "
-
 #~ msgid "Merge consecutive nickname in chat window."
 #~ msgstr "Elkartu hurren hurreneko izengoitia elkarrizketa leihoan."
 
@@ -6686,9 +10109,6 @@ msgstr "Errorea zerbitzarian sartzean.%s"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Baliogabeko gela edo zerbitzari izena"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "D-Bus bertsioa aurkitugabea: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard argitarapena egina"
 
@@ -6698,9 +10118,6 @@ msgstr "Errorea zerbitzarian sartzean.%s"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Historialeko Log-ak Esportatzen...."
 
-#~ msgid "_Join New Room"
-#~ msgstr "_Gela Berri Sartu"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d mezu irakurri gabe"
diff --git a/po/fr.po b/po/fr.po
index 16b99e34d..a07c1564a 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: 2008-09-15 21:41+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-31 03:53+0100\n"
 "Last-Translator: Le Coz Florent <louizatakk@gmail.com>\n"
 "Language-Team: \n"
@@ -298,9 +298,9 @@ msgstr "_Éditer les informations personnelles..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1040
-#: ../src/common/helpers.py:1052 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -309,11 +309,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2656
-#: ../src/roster_window.py:5139
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Général"
 
@@ -378,20 +378,20 @@ msgstr "Les informations vous concernant, stockées sur le serveur"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1550
-#: ../src/config.py:2050
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1458 ../src/config.py:1463
-#: ../src/config.py:1958 ../src/config.py:2036 ../src/config.py:2049
-#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2731 ../src/roster_window.py:2736
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Aucun"
 
@@ -558,7 +558,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
@@ -573,7 +573,7 @@ msgid "Mer_ge accounts"
 msgstr "_Regrouper les comptes"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5090
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Re_nommer"
 
@@ -793,7 +793,7 @@ msgid "All statuses"
 msgstr "Tous les états "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:287
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Absent(e)"
 
@@ -810,7 +810,7 @@ msgid "Have "
 msgstr "Ai"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -819,7 +819,7 @@ msgid "Launch a command"
 msgstr "Lancer une commande"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Non disponible"
 
@@ -1052,7 +1052,7 @@ msgstr "_Ajouter à la liste de contacts"
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5786
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historique"
 
@@ -1165,7 +1165,7 @@ msgstr ""
 "Quand le transfert de fichier est terminé, montrer une fenêtre de "
 "notification"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -1173,7 +1173,7 @@ msgstr "_Continuer"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le répertoire de destination"
 
@@ -1221,7 +1221,7 @@ msgstr "Personnalisation des thèmes de Gajim"
 msgid "Gone"
 msgstr "Parti"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inactif"
 
@@ -1330,7 +1330,7 @@ msgstr "_S'exprimer"
 msgid "Create new post"
 msgstr "Rédiger un article"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:312
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "De"
 
@@ -1387,7 +1387,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "Rechercher dans la base de données"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Historique de conversation"
 
@@ -1410,7 +1410,7 @@ msgstr "Chercher :"
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1689
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
@@ -1539,7 +1539,8 @@ 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 (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Changer le sujet du salon (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1569,7 +1570,7 @@ msgstr "Afficher le profil du contact (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "En_voyer"
 
@@ -1735,10 +1736,6 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Émoticônes :"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1748,7 +1745,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:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1758,7 +1755,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:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1766,11 +1763,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:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Cacher tous les boutons dans les fenêtres de conversations"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1778,7 +1775,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:53
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1786,14 +1783,14 @@ msgstr ""
 "Si activé, Gajim affichera également des informations à propos de "
 "l'expéditeur des nouveaux courriels"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:53
 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:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1801,7 +1798,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:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1809,7 +1806,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:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1817,28 +1814,28 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
 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:59
+#: ../data/glade/preferences_window.glade.h:58
 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:60
+#: ../data/glade/preferences_window.glade.h:59
 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:61
+#: ../data/glade/preferences_window.glade.h:60
 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 "
@@ -1849,7 +1846,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:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1859,7 +1856,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:63
+#: ../data/glade/preferences_window.glade.h:62
 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 "
@@ -1869,7 +1866,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:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1877,15 +1874,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:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"Si cette case est cochée, Gajim triera les contacts dans la fenêtre "
-"principale et dans les salons par statut et non pas par nom"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1895,7 +1884,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:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1903,7 +1892,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:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1911,47 +1900,43 @@ 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:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorer le formatage complexe du texte dans les messages entrants"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Archiver les conversations _chiffrées"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "_Rendre les fenêtres de conversation compactes"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Me signaler les contacts qui se _connectent"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 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:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Événements Personnels"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1961,19 +1946,19 @@ msgstr ""
 "Afficher une notification\n"
 "Afficher uniquement dans le Roster"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1981,23 +1966,28 @@ 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:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Trier les contacts par _état"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "État"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "_Icônes d'état :"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -2005,7 +1995,7 @@ msgstr ""
 "Le message de statut d'auto-absence. S'il est vide, Gajim ne modifiera pas "
 "le message de statut actuel"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -2013,42 +2003,52 @@ msgstr ""
 " Le message de statut d'auto-idle. S'il est vide, Gajim ne modifiera pas le "
 "message de statut actuel"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Utiliser la valeur par _défaut"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Quand un nouvel événement est reçu :"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "Passer _Absent(e) après :"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "_Afficher les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Émoticônes :"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorer le formatage complexe du texte dans les messages entrants"
+
 #: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Message _entrant :"
@@ -2082,22 +2082,28 @@ msgid "_Send chat state notifications:"
 msgstr "_Envoyer les notifications d'état :"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "Trier les contacts par _état"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "Mise à valeur des _URL :"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "Comportement de la _fenêtre :"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Rejoindre un _salon de discussion"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Pas dans la liste"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutes"
 
@@ -2145,7 +2151,7 @@ msgstr "Identifiant Jabber :"
 msgid "Order:"
 msgstr "Ordre :"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2558
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Liste privée"
 
@@ -2289,7 +2295,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Préfixe :</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Rôle :</b>"
 
@@ -2349,8 +2355,8 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5127
-#: ../src/roster_window.py:5604 ../src/roster_window.py:5733
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Supprimer"
 
@@ -2372,14 +2378,14 @@ msgstr "Éditer les _groupes..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5676
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5045 ../src/roster_window.py:5557
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_viter à"
 
@@ -2390,7 +2396,7 @@ msgstr "_Supprimer"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5055 ../src/roster_window.py:5642
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
 
@@ -2416,8 +2422,8 @@ msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5118 ../src/roster_window.py:5594
-#: ../src/roster_window.py:5723
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Bloquer"
 
@@ -2443,8 +2449,8 @@ msgid "_Subscription"
 msgstr "_Autorisation"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5112 ../src/roster_window.py:5588
-#: ../src/roster_window.py:5720
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Débloquer"
 
@@ -2543,7 +2549,7 @@ msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5745
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "Information"
 
@@ -2766,13 +2772,13 @@ msgstr "Assigner une clé Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5703
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Renommer"
 
@@ -2825,49 +2831,48 @@ msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Activé"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Désactivé"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Booléen"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Entier"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Couleur"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Option"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valeur"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Aucune)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Éléments masqués"
 
@@ -2876,149 +2881,149 @@ msgstr "Éléments masqués"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Anglais"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Allemand"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Grec"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Anglais (Britannique)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Français"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italien"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russe"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chinois"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1147 ../src/chat_control.py:1535
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "Chiffrement GPG activé"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2030
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:299 ../src/conversation_textview.py:844
-#: ../src/dialogs.py:895 ../src/gajim.py:1626 ../src/roster_window.py:925
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1527
-#: ../src/roster_window.py:1868 ../src/roster_window.py:3094
-#: ../src/roster_window.py:3118 ../src/roster_window.py:5239
-#: ../src/roster_window.py:5423
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat_control.py:1298 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Artiste Inconnu"
 
-#: ../src/chat_control.py:1300 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: ../src/chat_control.py:1302 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: ../src/chat_control.py:1306 ../src/tooltips.py:641
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3027,7 +3032,7 @@ msgstr ""
 "<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1311
+#: ../src/chat_control.py:1314
 #, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -3036,81 +3041,92 @@ msgstr ""
 "%(title)s par %(artist)s\n"
 "de %(source)s"
 
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
 
-#: ../src/chat_control.py:1525
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:1552
+#: ../src/chat_control.py:1560
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:1570
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:1570
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1580
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1584
 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:1586
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1632
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1643 ../src/groupchat_control.py:1575
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/chat_control.py:1646 ../src/groupchat_control.py:1589
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1594
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1610
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3119,65 +3135,65 @@ msgstr ""
 "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
 "Utilise la troisième personne. (ex : /%(command)s explose.)"
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Utilisation : /%s, envoie un ping au contact"
 
-#: ../src/chat_control.py:1660
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, envoie le message au contact"
 
-#: ../src/chat_control.py:1663 ../src/groupchat_control.py:1633
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
-#: ../src/chat_control.py:1794
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1807
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Ce message est chiffré]"
 
-#: ../src/chat_control.py:1804
+#: ../src/chat_control.py:1810
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:1806
+#: ../src/chat_control.py:1812
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
-#: ../src/chat_control.py:1811
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1813
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:1842 ../src/chat_control.py:1855
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1854
 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:2209
+#: ../src/chat_control.py:2225
 #, 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:2210
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3185,11 +3201,15 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2361 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: ../src/chat_control.py:2362 ../src/gajim.py:171
+#: ../src/chat_control.py:2377
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3198,7 +3218,7 @@ msgstr ""
 "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou "
 "supprimez le (toutes les archives seront perdues)."
 
-#: ../src/chat_control.py:2594
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
@@ -3268,40 +3288,40 @@ msgstr "Description de la présence :"
 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:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Quitter des Groupes de Discussion"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
 #, 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:195
 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:202
 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:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:793 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1531 ../src/roster_window.py:5015
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "Vous avez quitté les groupes de discussion suivants :"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr "Transférer les messages non-lus"
 
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr "Tous les messages non-lus ont été transmis."
 
@@ -3344,20 +3364,20 @@ msgstr ""
 
 #. sorted alphanum
 #: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3095
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "Par défaut"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Activer la messagerie link-local/zeroconf "
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Langue utilisée par le vérificateur orthographique"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3368,7 +3388,7 @@ msgstr ""
 "minute.\n"
 "'never' - ne jamais afficher l'heure."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 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. "
@@ -3380,19 +3400,19 @@ msgstr ""
 "valeur 0. Ceci est utilisé seulement lorsque la valeur de print_time est "
 "'sometimes'."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *"
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3402,7 +3422,7 @@ msgstr ""
 "Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3410,7 +3430,7 @@ msgstr ""
 "Caractère à ajouter après un surnom en utilisant la complétion automatique "
 "(tab) dans un salon de discussion."
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3418,7 +3438,7 @@ msgstr ""
 "Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans "
 "un salon de discussion."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3429,18 +3449,14 @@ msgstr ""
 "documentation python de strftime pour une documentation complète : http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caractères affichés avant le surnom dans les conversations"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caractères affichés après le surnom dans les conversations"
 
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "Le nom d'utilisateur utilisé comme identifiant pour le compte Last.fm."
-
 #: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
@@ -3774,7 +3790,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Défilement doux dans la fenêtre de conversation"
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Liste des couleurs qui seront utilisées pour colorier les surnoms dans les "
 "salons de discussion."
@@ -4010,7 +4029,7 @@ msgstr "'yes', 'no' ou 'both'"
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ou ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Dort"
 
@@ -4022,7 +4041,7 @@ msgstr "Bientôt de retour"
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Mange"
 
@@ -4038,7 +4057,7 @@ msgstr "Film"
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Travaille"
 
@@ -4070,7 +4089,7 @@ msgstr "Disponible"
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:427 ../src/config.py:1390
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Revient de suite."
 
@@ -4098,11 +4117,11 @@ msgstr ""
 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:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "épicerie"
 
@@ -4135,25 +4154,38 @@ msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:926
-#: ../src/common/connection_handlers.py:1842
-#: ../src/common/connection_handlers.py:1882
-#: ../src/common/connection_handlers.py:2058
-#: ../src/common/connection_handlers.py:2177 ../src/common/connection.py:1211
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Erreur d'Écriture du disque"
 
-#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:851
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: ../src/common/connection_handlers.py:1951
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"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/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Surnom invalide : %s"
@@ -4161,70 +4193,70 @@ msgstr "Surnom invalide : %s"
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2020
-#: ../src/common/connection_handlers.py:2023
-#: ../src/common/connection_handlers.py:2026
-#: ../src/common/connection_handlers.py:2029
-#: ../src/common/connection_handlers.py:2033 ../src/gajim.py:546
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2021
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni du salon %s."
 
-#: ../src/common/connection_handlers.py:2024
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Le salon %s n'existe pas."
 
-#: ../src/common/connection_handlers.py:2027
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2030
+#: ../src/common/connection_handlers.py:2063
 #, 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:2034
+#: ../src/common/connection_handlers.py:2067
 #, 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:2069
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: ../src/common/connection_handlers.py:2076
+#: ../src/common/connection_handlers.py:2116
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: ../src/common/connection_handlers.py:2103
+#: ../src/common/connection_handlers.py:2143
 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:2124
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2126
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2128
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4235,216 +4267,216 @@ msgstr ""
 "tel que http://jru.jabberstudio.org pour le supprimer"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2321
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2323
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur "
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossible de déchiffrer la signature du certificat"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "Échec de la signature CRL"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Le certificat n'est pas encore valide"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL n'est pas encore valide"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL a expiré"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Certificat auto-signé"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "Impossible de vérifier le premier certificat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Chaîne du certificat trop longue"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Certificat révoqué"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Certificat CA invalide"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Objet du certificat non-supporté"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Certificat refusé"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
 
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:312
 #, 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:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, 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:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:713
-#: ../src/common/connection.py:1340
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1042
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:645 ../src/common/connection.py:693
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:646 ../src/common/connection.py:694
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:668
+#: ../src/common/connection.py:666
 #, 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:671
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4453,7 +4485,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:673
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4462,24 +4494,24 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:741
+#: ../src/common/connection.py:739
 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:802
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:803
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4506,7 +4538,7 @@ msgstr ""
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4516,33 +4548,33 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1373
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Observateurs"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:792 ../src/roster_window.py:827
-#: ../src/roster_window.py:1454 ../src/roster_window.py:1521
-#: ../src/roster_window.py:1523 ../src/roster_window.py:1666
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Passerelles"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Pas dans la liste"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher

 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 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:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 
@@ -4721,250 +4753,250 @@ msgstr "Fin de la semaine"
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:161
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:172
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gio"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mio"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "O_ccupé"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Occupé(e)"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:280 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "_Absent(e)"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "Déc_onnecté"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:322
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Membre"
 
-#: ../src/common/helpers.py:398
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:405
 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:405
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
-#: ../src/common/helpers.py:989 ../src/common/helpers.py:996
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, 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:1002
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " du salon %s"
 
-#: ../src/common/helpers.py:1005 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr "de l'utilisateur %s"
 
-#: ../src/common/helpers.py:1007
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr "de %s"
 
-#: ../src/common/helpers.py:1014 ../src/common/helpers.py:1021
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, 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:1054
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -4977,515 +5009,649 @@ msgstr "Compte Gajim %s"
 msgid "Afraid"
 msgstr "Effrayé"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Épaté"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Excité"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "En colère"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Ennuyé"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Anxieux"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Excité"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Honteux"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Ennuyé"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Courageux"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Calme"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Curieux"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Froid"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Sommaire"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Confus"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Satisfait"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Satisfait"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Grincheux"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Grincheux"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Désactivé"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Curieux"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Supprimer"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Déprimé"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Déçu"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Écœuré"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Désactivé"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Distrait"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:56
 msgid "Embarrassed"
 msgstr "Embarrassé"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Anxieux"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Excité"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Galant"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Frustré"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Conduit"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Grognon"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Coupable"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Joyeux"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Chaud"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Humble"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Humilié"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Affamé"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Blessé"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Impressionné"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "Craintif"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Amoureux"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Indigné"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Intéressé"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Intoxiqué"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Solitaire"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Serveur :"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Méchant"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Morose"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nerveux"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutre"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Outré"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustré"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Enjoué"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Fier"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Soulagé"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Soulagé"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Plein de remords"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Impatient"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Sarcastique"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Dernière modification :"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Concentré"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Choqué"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Timide"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Malade"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Endormi"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Stressé"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Surpris"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Assoiffé"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Pensif"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Durée"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "neuf"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Inquiet"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Fait des corvées"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Achète des provisions"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Nettoie"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Cuisine"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Fait de la maintenance"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Fait la vaisselle"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Lave le linge"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Jardine"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Fait une course"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Promène le chien"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Boit"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Prend une bière"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Prend un café"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Prend un thé"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Prend un Snack"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Prend le petit-déjeuner"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Soupe"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Dîne"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Fait de l'exercice"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Fait du vélo"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Nettoie"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Fait de la randonnée"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Fait un jogging"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Fait du sport"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Court"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Skie"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Nage"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "S'entraine"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Se toilette"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "À la station thermale"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Se brosse les dents"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Se fait couper les cheveux"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Se rase"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Prend un bain"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Prend une douche"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "À un rendez-vous"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "En congé"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Traîne"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Fait de la randonnée"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Fait la fête"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "En vacances organisées"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Boit"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Se relaxe"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Fait de la randonnée"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Joue"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Sort"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Fait la fête"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Lit"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Se prépare"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Fait les magasins"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Skie"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Se socialise"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Prend un bain de soleil"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Regarde la télé"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Regarde un film"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Discute"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "Dans la vraie vie"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "En visioconférence"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Voyage"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Fait la navette"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Conduit"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "En voiture"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "En bus"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "En avion"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "En train"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "En séjour"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Marche"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Programme"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "En réunion"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Étudie"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Écrit"
 
@@ -5504,7 +5670,7 @@ msgstr ""
 "transfert de fichiers sera annulé."
 
 #. we're not english
-#: ../src/common/stanza_session.py:274
+#: ../src/common/stanza_session.py:278
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5597,40 +5763,40 @@ msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé
 msgid "Error while adding service. %s"
 msgstr "Erreur en ajoutant le service. %s"
 
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:319
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:327
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: ../src/config.py:410
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:452
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Toujours utiliser les applications OS/X par défaut."
 
-#: ../src/config.py:453
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../src/config.py:643 ../src/dialogs.py:1191
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:644
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5639,253 +5805,253 @@ 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:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Premier message reçu"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Message Reçu Suivant Avec le Focus."
 
-#: ../src/config.py:1049
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Message Reçu Suivant Sans le Focus"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Contact connecté"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contact déconnecté"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Message envoyé"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
 
 #. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1815 ../src/dialogs.py:1879
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
 #: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
-#: ../src/history_window.py:86
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1399
+#: ../src/config.py:1406
 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:1524 ../src/config.py:1623
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1659 ../src/config.py:1702
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1660
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: ../src/config.py:1686
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: ../src/config.py:1687
+#: ../src/config.py:1694
 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:1698
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1699
+#: ../src/config.py:1706
 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:1703
+#: ../src/config.py:1710
 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:1709
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1710
+#: ../src/config.py:1717
 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:1714 ../src/config.py:1718
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1715
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1719
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1793
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:1794
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:1812 ../src/config.py:1820 ../src/config.py:1863
-#: ../src/config.py:3090 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1821
+#: ../src/config.py:1828
 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:2011 ../src/config.py:3162
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2012 ../src/config.py:3163
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2034
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Il y a eu un problème durant la récupération de vos clés OpenPGP secrètes."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2081
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2082
+#: ../src/config.py:2089
 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:2089 ../src/dialogs.py:1667 ../src/dialogs.py:1803
-#: ../src/dialogs.py:1983 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2094
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2126
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2127
+#: ../src/config.py:2134
 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:2310
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2312
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2348
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2349
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2351
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2400 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2442
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2444
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5893,11 +6059,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2446
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2447
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5905,11 +6071,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2450
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5917,11 +6083,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2452
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2453
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5929,7 +6095,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2454
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5946,46 +6112,46 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2557
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2579 ../src/gajim.py:1414 ../src/roster_window.py:1931
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2580 ../src/roster_window.py:1905
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1932
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:2687
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "Aucun"
 
@@ -6003,27 +6169,27 @@ msgid ""
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
-#: ../src/config.py:3073
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3075
+#: ../src/config.py:3074
 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:3101
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Identifiant Jabber dupliqué"
 
-#: ../src/config.py:3102
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Ce compte est déjà configuré dans Gajim."
 
-#: ../src/config.py:3119
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3120 ../src/config.py:3309
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6033,24 +6199,24 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3138
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: ../src/config.py:3139
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3190 ../src/gajim.py:1990
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3191 ../src/gajim.py:1991
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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:3259
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6065,7 +6231,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3265 ../src/gajim.py:2014
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6076,30 +6242,30 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3288 ../src/config.py:3327
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3308
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3412
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/conversation_textview.py:548
+#: ../src/conversation_textview.py:549
 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:567
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6107,52 +6273,57 @@ 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:677
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:694
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:711
+#: ../src/conversation_textview.py:712
 #, 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:724
+#: ../src/conversation_textview.py:725
 #, 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:727
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:733
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
-#: ../src/conversation_textview.py:1222
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "erreur en envoyant %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Hier"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1226
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1260
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -6187,145 +6358,145 @@ msgstr "Nom du contact : <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Identifiant Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Définir l'Humeur"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ce nom est déjà utilisé. Voulez vous remplacer ce message de statut ?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Adresse AIM :"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Numéro GG :"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Numéro ICQ :"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Adresse MSN :"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Adresse Yahoo! :"
 
-#: ../src/dialogs.py:711
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:713
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:870 ../src/dialogs.py:876 ../src/dialogs.py:881
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:877
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:900
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/dialogs.py:896
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:933
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1003
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1005
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035
 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:1030
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Yann Le Boulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Florent Le Coz <louizatakk@gmail.com>"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6338,93 +6509,93 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1596
+#: ../src/dialogs.py:1614
 #, 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:1599
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:1660 ../src/gajim.py:2594
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:1686
 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:1687
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:1758
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1380
-#: ../src/groupchat_control.py:1656
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Le pseudonyme contient des caractères non autorisés."
 
-#: ../src/dialogs.py:1763 ../src/dialogs.py:1769
-#: ../src/groupchat_control.py:1824
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:1764 ../src/dialogs.py:1770
-#: ../src/groupchat_control.py:1825
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 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:1776
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:1777
+#: ../src/dialogs.py:1795
 #, 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:1804
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:1818
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:1852
+#: ../src/dialogs.py:1870
 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:1876
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:1937
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6433,273 +6604,275 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1962 ../src/dialogs.py:2337 ../src/dialogs.py:2480
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:1963 ../src/dialogs.py:2338 ../src/dialogs.py:2481
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:1972 ../src/dialogs.py:1975
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:1975
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:1984
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2003
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2003
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2007
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2008
+#: ../src/dialogs.py:2025
 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:2047 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:2049 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
-#: ../src/dialogs.py:2051 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:2051 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:2052 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:2052 ../src/gajim.py:1580 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2054 ../src/gajim.py:1646 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2056 ../src/gajim.py:1545 ../src/gajim.py:1613
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2058 ../src/gajim.py:1688 ../src/gajim.py:1710
-#: ../src/gajim.py:1727 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1691 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1435 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:2063 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2258
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2260
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2286
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2381
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2382
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:2426
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:2428
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2552
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2556
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2628
 #, 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:2617
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:2659
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:2746
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:2842
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:2844
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:2914
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:2915
+#: ../src/dialogs.py:2931
 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:2948
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:2951
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:2953
+#: ../src/dialogs.py:2968
 #, 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:2961
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:3018
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:3028 ../src/dialogs.py:3079
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3066
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:3084
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3149
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:3151
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
 #. # means number
-#: ../src/dialogs.py:3222
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3346
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "quand je suis "
 
-#: ../src/dialogs.py:3821
+#: ../src/dialogs.py:3836
 #, fuzzy, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6710,19 +6883,19 @@ msgstr ""
 "\n"
 "La Short Authentication String (SAS) de cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3825
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3839
+#: ../src/dialogs.py:3854
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3844
+#: ../src/dialogs.py:3859
 #, fuzzy
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
@@ -6732,20 +6905,20 @@ msgstr ""
 "Afin d'être certain que seule la personne prévue puisse lire vos messages et "
 "vous en envoyer, vous devez vérifier leur identité."
 
-#: ../src/dialogs.py:3847
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:3869
 #, fuzzy
 msgid "Verify..."
 msgstr "Vérifier"
 
-#: ../src/dialogs.py:3866
+#: ../src/dialogs.py:3881
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:3867
+#: ../src/dialogs.py:3882
 #, fuzzy, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6760,10 +6933,32 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:3883
 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:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+"La clef du contact (%s) ne correspond pas à la clef assignée dans Gajim."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
 #: ../src/disco.py:116
 msgid "Others"
 msgstr "Autres"
@@ -6921,7 +7116,7 @@ msgstr "Nécessite python-dbus."
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Fonctionnalité indisponible sous Windows."
 
@@ -7069,8 +7264,18 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transforme les expressions LaTeX entre $$ $$."
 
 #: ../src/features_window.py:101
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Nécessite texlive-latex-base, dvips et imagemagick. Vous devez définir "
+"« use_latex » à True dans l'éditeur de configuration avancée."
+
+#: ../src/features_window.py:102
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Nécessite texlive-latex-base, dvips et imagemagick. Vous devez définir "
@@ -7133,106 +7338,106 @@ msgstr "Durée"
 msgid "Progress"
 msgstr "Progression"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enregistré dans : %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinataire : %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Transfert de fichier arrêté par votre contact"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Description :"
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7240,33 +7445,33 @@ msgstr ""
 "Un fichier du même nom existe déjà et vous n'avez pas la permission de "
 "l'écraser."
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Vous n'avez pas les permissions de créer des fichiers dans ce dossier."
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7274,32 +7479,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fichier : "
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
@@ -7376,26 +7581,26 @@ msgstr ""
 "Gajim semble déjà être en cours d'exécution\n"
 "Démarrer quand même ?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, 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)."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7406,50 +7611,50 @@ msgstr ""
 "utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: ../src/gajim.py:566
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
 
-#: ../src/gajim.py:614 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: ../src/gajim.py:920 ../src/gajim.py:924
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:934 ../src/gajim.py:947
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:979
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:980
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Le contact \"%s\" vous a autorisé à voir son état."
 
-#: ../src/gajim.py:999
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:1000
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7457,75 +7662,75 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:1220 ../src/groupchat_control.py:1092
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
 
-#: ../src/gajim.py:1235 ../src/groupchat_control.py:1266
-#: ../src/history_window.py:410 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1305
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1362 ../src/groupchat_control.py:1052
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
-#: ../src/gajim.py:1365
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1373
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: ../src/gajim.py:1415
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
 
-#: ../src/gajim.py:1449
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7533,27 +7738,27 @@ msgstr ""
 "Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
 "GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:1454
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:1556
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouveau courriel sur %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Vous avez %d nouveau courrier électronique"
 msgstr[1] "Vous avez %d nouveaux courriers électroniques"
 
-#: ../src/gajim.py:1572
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7568,35 +7773,35 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1643
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gajim.py:1711
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1715
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
 
-#: ../src/gajim.py:1728
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1732
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7605,36 +7810,36 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: ../src/gajim.py:1825
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: ../src/gajim.py:1895
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: ../src/gajim.py:1896
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: ../src/gajim.py:1908
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: ../src/gajim.py:1921
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: ../src/gajim.py:1932
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Erreur."
 
-#: ../src/gajim.py:1957
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/gajim.py:1958
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7642,11 +7847,11 @@ msgstr ""
 "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
 "entrer une nouvelle"
 
-#: ../src/gajim.py:2011
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: ../src/gajim.py:2012
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7657,15 +7862,15 @@ msgstr ""
 "serveur Jabber : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7683,11 +7888,11 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: ../src/gajim.py:2055 ../src/gajim.py:2085
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: ../src/gajim.py:2056
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7695,16 +7900,16 @@ msgstr ""
 "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
 "chiffrée. Êtes vous sûr de vouloir le faire ?"
 
-#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
 
-#: ../src/gajim.py:2059 ../src/gajim.py:2089 ../src/groupchat_control.py:1765
-#: ../src/roster_window.py:3777
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: ../src/gajim.py:2086
+#: ../src/gajim.py:2089
 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?"
@@ -7713,21 +7918,21 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: ../src/gajim.py:2103
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "Le nœud PEP n'a pas été supprimé"
 
-#: ../src/gajim.py:2104
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2552 ../src/gajim.py:2573
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/gajim.py:2553
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7735,7 +7940,7 @@ msgstr ""
 "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
 "désactivées."
 
-#: ../src/gajim.py:2574
+#: ../src/gajim.py:2594
 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 "
@@ -7745,7 +7950,7 @@ msgstr ""
 "mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
 "wiki/Emoticons pour plus de détails."
 
-#: ../src/gajim.py:2600 ../src/roster_window.py:3307
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 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 "
@@ -7753,60 +7958,51 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2884
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gajim.py:2981
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/gajim.py:2982
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
 
-#: ../src/gajim.py:2995
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/gajim.py:2996
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
 "contacts."
 
-#: ../src/gajim.py:3185
-msgid "Network Manager support not available"
-msgstr "Network Manager n'est pas disponible"
-
-#: ../src/gajim.py:3310
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Afficher l'aide pour une commande"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7814,47 +8010,47 @@ msgstr ""
 "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
 "sur une ligne séparée"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Change l'état du ou des compte(s)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7863,21 +8059,21 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
 "un contact"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "L'identifiant Jabber du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7887,29 +8083,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera chiffré en utilisant cette clé publique"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7919,135 +8115,135 @@ msgstr ""
 "et le compte sont facultatifs. Si vous voulez seulement renseigner le "
 "paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "sujet"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "sujet du message"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "identifiant Jabber"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Ajoute un nouveau contact à ce compte"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ouvre la fenêtre « Commencer une discussion »"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Commencer une discussion en utilisant ce compte"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8055,70 +8251,70 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Gère une URI du type xmpp:"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Compte avec lequel vous voulez le gérer"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Joindre un groupe de discussions"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "groupe de discussion"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 #, fuzzy
 msgid "Room JID"
 msgstr "Salon de discussion :"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "pseudonyme"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "mot de passe"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Account from which you want to enter the room"
 msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:326
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8127,33 +8323,33 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:329
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:382
+#: ../src/gajim-remote.py:380
 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:411
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:419
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:423
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8162,7 +8358,7 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:496
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8171,7 +8367,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tappez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:501
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8180,7 +8376,7 @@ msgstr ""
 "L'argument \"%(arg)s\" n'est pas précisé.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Mauvaise adresse (URI)"
 
@@ -8210,34 +8406,34 @@ 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:145
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
 #, 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:384
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:536
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Conversation avec"
 
-#: ../src/groupchat_control.py:538
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
 
-#: ../src/groupchat_control.py:956
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
@@ -8245,116 +8441,116 @@ msgstr ""
 "identifiant Jabber."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1057
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1060
+#: ../src/groupchat_control.py:1132
 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:1066
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1070
+#: ../src/groupchat_control.py:1142
 #, 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:1077
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1081
+#: ../src/groupchat_control.py:1153
 #, 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:1090
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1128 ../src/groupchat_control.py:1132
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1129
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1280
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1284
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1299
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1303
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1264
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1655
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/groupchat_control.py:1403 ../src/groupchat_control.py:1421
-#: ../src/groupchat_control.py:1505 ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Ce salon de discussion n'a pas de sujet"
 
-#: ../src/groupchat_control.py:1448
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
 
-#: ../src/groupchat_control.py:1578
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8367,7 +8563,7 @@ msgstr ""
 "pas de \"@\". Si l'identifiant Jabber est actuellement dans le salon il sera "
 "également éjecté. Ne supporte pas les espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1585
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8376,7 +8572,7 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec "
 "l'occupant(e) spécifié(e)."
 
-#: ../src/groupchat_control.py:1591
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8385,7 +8581,7 @@ msgstr ""
 "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en "
 "affichant la raison si spécifiée."
 
-#: ../src/groupchat_control.py:1597
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8394,7 +8590,7 @@ msgstr ""
 "Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant Jabber "
 "dans le salon actuel, la raison est optionnelle."
 
-#: ../src/groupchat_control.py:1601
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8403,7 +8599,7 @@ msgstr ""
 "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
 "salon@serveur en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1605
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8414,7 +8610,7 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1614
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8423,23 +8619,23 @@ msgstr ""
 "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
 "envoie le message à l'occupant(e) spécifié(e) par le surnom."
 
-#: ../src/groupchat_control.py:1619
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1623
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Utilisation : /%s , affiche les noms des occupants du salon."
 
-#: ../src/groupchat_control.py:1627
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1630
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8447,39 +8643,39 @@ msgstr ""
 "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
 "commandes."
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1839
 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:1798
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1803
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1804
+#: ../src/groupchat_control.py:1882
 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:1831
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:1832
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8487,22 +8683,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:1834
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2008
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:2009 ../src/groupchat_control.py:2312
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2311
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -8588,7 +8784,7 @@ msgstr "Contacts"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Date"
 
@@ -8599,7 +8795,7 @@ msgstr "Pseudonyme"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Message"
 
@@ -8650,22 +8846,27 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les messages sélectionnés ?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de conversation avec %s"
 
-#: ../src/history_window.py:406
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Erreur d'écriture du disque"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:416
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:419
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
@@ -8678,19 +8879,19 @@ msgstr "Délai du chargement de l'image dépassé"
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Messages"
 
@@ -8702,42 +8903,42 @@ msgstr "- les messages seront archivés"
 msgid "- messages will not be logged"
 msgstr "- les messages ne seront pas archivés"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nouveau message privé dans le salon %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Message de %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
@@ -8750,18 +8951,18 @@ msgstr "Générique"
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2770
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2773
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2775 ../src/roster_window.py:2786
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
@@ -8793,38 +8994,38 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:954
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1848
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1869
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1882
 #, 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:1882
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1883
+#: ../src/roster_window.py:1895
 #, 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:1908
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8832,15 +9033,15 @@ msgstr ""
 "Gnome Keyring est installé mais pas \t\t\t\t\t\t\tcorrectement démarré "
 "(variable d'environnement probablement \t\t\t\t\t\t\tmal configurée)"
 
-#: ../src/roster_window.py:1918 ../src/roster_window.py:1938
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:2106 ../src/roster_window.py:3250
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2107 ../src/roster_window.py:3251
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8848,15 +9049,15 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2133
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2267 ../src/roster_window.py:2504
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2268
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8864,16 +9065,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:2505
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2508
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8881,11 +9082,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2512
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2517
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8895,52 +9096,52 @@ msgstr ""
 "passerelles : %s"
 
 #. it's jid
-#: ../src/roster_window.py:2651
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:2652
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:2659
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:2660
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:2716
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:2717
+#: ../src/roster_window.py:2734
 #, 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:2718
+#: ../src/roster_window.py:2735
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Supprimer tous les contacts de ce groupe de votre liste de contacts"
 
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2758
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3111
+#: ../src/roster_window.py:3128
 #, 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:3115
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8949,12 +9150,12 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3120
+#: ../src/roster_window.py:3137
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8962,16 +9163,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3144
 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:3131
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3135
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8981,20 +9182,20 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3175
+#: ../src/roster_window.py:3192
 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:3691
+#: ../src/roster_window.py:3708
 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:3693
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9003,14 +9204,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:3771
+#: ../src/roster_window.py:3784
 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:3773
+#: ../src/roster_window.py:3786
 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 "
@@ -9020,11 +9221,11 @@ 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:3886
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:3910
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9036,123 +9237,123 @@ msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4568 ../src/roster_window.py:4639
-#: ../src/roster_window.py:4648 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
 #. add
-#: ../src/roster_window.py:4655
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:4660
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4697 ../src/systray.py:257
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4717
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:4757
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4819 ../src/roster_window.py:4928
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:4846
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:4853
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Humeur"
 
-#: ../src/roster_window.py:4857
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Activité"
 
-#: ../src/roster_window.py:4862
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5016
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
 #. Send Group Message
-#: ../src/roster_window.py:5024 ../src/roster_window.py:5549
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5032
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5036
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
-#: ../src/roster_window.py:5446
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5569
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
 #. Send single message
-#: ../src/roster_window.py:5630
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5686
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5694
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:5776
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:5856
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Nouveau Salon de Discussion"
 
 #. History manager
-#: ../src/roster_window.py:5969
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:5978
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:6188
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -9169,20 +9370,20 @@ msgstr "Erreur dans la forme des données reçues"
 msgid "No result"
 msgstr "Aucun résultat."
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Erreur d'écriture du disque"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Sujet : %s"
 
-#: ../src/session.py:391 ../src/session.py:423
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
-#: ../src/session.py:392
+#: ../src/session.py:400
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9197,7 +9398,7 @@ msgstr ""
 "\n"
 "\t\tCes options sont-elles acceptables ?"
 
-#: ../src/session.py:424
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9212,19 +9413,19 @@ msgstr ""
 "\n"
 "Continuer la session ?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Identifiant Jabber :"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ressource : "
 
@@ -9241,95 +9442,95 @@ msgstr " [bloqué]"
 msgid " [minimized]"
 msgstr " [minimisé]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Dernier état : %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " depuis %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Déconnecté(e)"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Humeur :"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Activité :"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Ton :"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:En pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 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:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9337,31 +9538,31 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 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:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9369,12 +9570,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "vôtre"
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 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:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9382,22 +9583,65 @@ 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:333
+#: ../src/vcard.py:332
 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:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#~ msgid "E2E encryption enabled"
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Bascule le chiffrement _GPG"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
+#~ "Utilise la troisième personne. (ex : /%(command)s explose.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
 #~ msgstr "Chiffrement E2E activé"
 
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "Chiffrement E2E désactivé"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim triera les contacts dans la fenêtre "
+#~ "principale et dans les salons par statut et non pas par nom"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr ""
+#~ "Le nom d'utilisateur utilisé comme identifiant pour le compte Last.fm."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Pensif"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Manager n'est pas disponible"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Support du gestionnaire de sessions indisponible (module gnome.ui "
+#~ "manquant)"
+
 #~ msgid "General:"
 #~ msgstr "Général :"
 
@@ -9554,9 +9798,5 @@ msgstr " ressource avec la priorité "
 #~ "Gajim a besoin que vous créiez un mot de passe afin de chiffrer les "
 #~ "secrets stockés"
 
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
-
 #~ msgid "Role:"
 #~ msgstr "Fonction :"
diff --git a/po/gl.po b/po/gl.po
index 071188f58..af53ff494 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,12 +5,11 @@
 # This file is distributed under the same license as the gajim package.
 # Automatically generated, 2004.
 #
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-03-13 11:38+0100\n"
 "Last-Translator: Iván Méndez López\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
@@ -33,44 +32,53 @@ msgid "Jabber IM Client"
 msgstr "Cliente de MI de Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Enviar unha _mensaxe..."
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Descubrir os servizos..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupos de charla"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Modificar conta"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modificar a conta..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -83,122 +91,146 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Prema para ver as características (como transportes de MSN e ICQ) dos "
 "servidores de Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Conectar cando prema Rematar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: asistente para crear unha conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 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:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "_Contrasinal: "
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Xestionar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "_Gardar o contrasinal"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Características dos servidores"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Configurar o meu perfil ao me conectar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Usa un nome de host e un porto personalizados"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
-msgstr "Precisa unha conta para se conectar\n" 
+msgstr ""
+"Precisa unha conta para se conectar\n"
 "á rede Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "O seu identificador JID"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Rematar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Servidor:"
-msgstr "_Host:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Nome do host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "C_ontrasinal:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Introduza, mais unha vez, o contrasinal:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Usar proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Nome de usuario:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varios</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información persoal</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Conta"
 
@@ -207,169 +239,212 @@ msgid "Account Modification"
 msgstr "Modificar a conta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Conectar automaticamente se se perde a conexión"
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Listaxe de administradores"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Conectar automaticamente se se perde a conexión"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar ao inicio de Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Cam_biar o contrasinal"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 ""
-"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"
+"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:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Elixir a _chave..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Prema para cambiar o contrasinal da conta"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "_Editar a información persoal..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Xeral"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome do host:"
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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 ""
-"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."
+"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:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
-"Se isto está marcado, o Gajim enviará paquetes de mantemento de actividade para "
-"previr que expire a conexión"
+"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:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
-"Se isto está marcado, o Gajim gardará o contrasinal en ~/.gajim/config para o que unicamente vostede terá acceso de só lectura"
+"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:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
-"Se isto está marcado, o Gajim, ao se iniciar, conectarase automaticamente a Jabber "
-"con esta conta."
+"Se isto está marcado, o Gajim, ao se iniciar, conectarase automaticamente a "
+"Jabber con esta conta."
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 msgstr ""
-"Se isto está marcado, calquera mudanza do estado global (manexado polo caixa de combinación da parte inferior da listaxe de contactos) cambiará o "
-"estado desta conta en consecuencia"
+"Se isto está marcado, calquera mudanza do estado global (manexado polo caixa "
+"de combinación da parte inferior da listaxe de contactos) cambiará o estado "
+"desta conta en consecuencia"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Xestionar..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Non se seleccionou ningunha chave"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ningún"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porto: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Pr_ioridade:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
 "client with the highest priority gets the events"
 msgstr ""
-"Jabber emprega a prioridade para determinar quen obtén os acontecementos "
-"do servidor cando dous ou máis clientes están conectados e usan a mesma "
-"conta. O cliente con maior prioridade recibe os acontecementos."
+"Jabber emprega a prioridade para determinar quen obtén os acontecementos do "
+"servidor cando dous ou máis clientes están conectados e usan a mesma conta. "
+"O cliente con maior prioridade recibe os acontecementos."
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 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:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+#, fuzzy
+msgid "Resour_ce:"
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -378,97 +453,165 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 "O recurso envíaselle ao servidor de Jabber para 'separar' o mesmo "
-"identificador en dous ou máis partes a depender do número de clientes "
-"que estiveren conectados no servidor coa mesma conta. Así pode estar "
-"conectado e empregar a mesma conta co recurso 'Casa' ou 'Traballo' ao mesmo "
-"tempo. O recurso que teña a prioridade máis alta será o que reciba os "
-"eventos (mire máis abaixo)."
+"identificador en dous ou máis partes a depender do número de clientes que "
+"estiveren conectados no servidor coa mesma conta. Así pode estar conectado e "
+"empregar a mesma conta co recurso 'Casa' ou 'Traballo' ao mesmo tempo. O "
+"recurso que teña a prioridade máis alta será o que reciba os eventos (mire "
+"máis abaixo)."
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Gardar o contrasinal (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Gravar as conversas para todos os contactos"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantemento de actividade"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 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:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Usa un nome de host e un porto personalizados"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para as transferencias de ficheiros"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Adaptar ao estado"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "_Nome: "
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Propiedades</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Se isto está marcado, todos os contactos locais que empregaren un cliente Bonjour "
-"compatíbel (como iChat, Trillian ou Gaim) apareceran na listaxe de contactos. Non "
-"precisa estar conectado a un servidor de Jabber para o seu funcionamento.\n"
-"Isto só está dispoñíbel se o python-avahi está instalado e o avahi-daemon "
-"está en execución."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Correo electrónico:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activar"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ten dúas ou máis contas e isto está marcado, o Gajim relacionará todos os "
-"contactos de forma mixta"
+"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:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "ID de Jabber:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Apelido(s):"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Combinar as contas"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "Habilitar m_ensaxaría de ligazón local"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Modificar"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Eliminar"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Usar o porto personalizado:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -487,8 +630,9 @@ 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
+#, fuzzy
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -527,7 +671,8 @@ msgid "_User ID:"
 msgstr "ID de _usuario:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
-msgid "<b>An error has occured:</b>"
+#, fuzzy
+msgid "<b>An error has occurred:</b>"
 msgstr "<b>Produciuse un erro:</b>"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -563,12 +708,15 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Descrición</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
-msgstr "<b>NOTA:</b> Debe reiniciar o Gajim para que algúns cambios teñan efecto"
+#, 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
 msgid "Advanced Configuration Editor"
@@ -587,45 +735,47 @@ msgid "Deletes Message of the Day"
 msgstr "Elimina a mensaxe do día (MDD)"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "Envíalles unha mensaxe aos usuarios conectados neste momento ao servidor"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Listaxes de _privacidade"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Definir a MDD"
+#, 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
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Definir a MDD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Define a mensaxe do día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Amosar a consola de _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Actualizar a MDD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Actualiza a mensaxe do día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "Listaxes de _privacidade"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Enviar a mensaxe do servidor"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Enviar mensaxe"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " hai unha fiestra/separador aberto con este contacto "
@@ -639,7 +789,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condicións</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
@@ -656,7 +806,7 @@ msgid "All statuses"
 msgstr "Todos os estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Ausente"
 
@@ -673,7 +823,7 @@ msgid "Have "
 msgstr "Ten "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -682,7 +832,7 @@ msgid "Launch a command"
 msgstr "Enviar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
@@ -699,16 +849,16 @@ msgid "Play a sound"
 msgstr "Reproducir un _son"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
+#, fuzzy
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 "Recibir unha mensaxe\n"
 "O contacto está conectado \n"
@@ -720,57 +870,58 @@ msgstr ""
 "Transferencia iniciada \n"
 "Transferencia rematada"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr "Cando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/glade/advanced_notifications_window.glade.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"
+"_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:29
+#: ../data/glade/advanced_notifications_window.glade.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:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr "_Desactivar as fiestras emerxentes existentes"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Desactivar os sons existentes para este acontecemento"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Desactivar mostrar os eventos no roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.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:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informarme cunha fiestra emerxente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Open chat window with user"
 msgstr "_Abrir unha fiestra de charla con este usuario"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Show event in roster"
 msgstr "_Mostrar o evento na listaxe de contactos"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
 msgstr "_Mostrar o evento na área de notificación"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr "e eu "
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -780,50 +931,62 @@ msgstr ""
 "grupo(s)\n"
 "todo o mundo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 msgid "for "
 msgstr "para "
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr "cando eu estea en"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Romeo e Xulieta</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Entrada:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Nome do feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Recibiuse unha entrada nova"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Historias antigas"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Soliloquio"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Recibiu unha entrada nova:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Contactos"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Mensaxes de estado predefinidas</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Sons</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
@@ -853,10 +1016,9 @@ msgid "Join _Group Chat"
 msgstr "Entrar nun grupo de charla"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Engadir á listaxe de contactos"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -876,39 +1038,70 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../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/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Prema aquí para ver as charlas anteriores con este contacto"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Contactos"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar ficheiro"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Alternar a codificación OpenPGP"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar a codificación OpenPGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "Vista _compacta    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Engadir á listaxe de contactos"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historial"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Con_vidar"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observadores"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Cubrir o formulario."
@@ -921,6 +1114,24 @@ msgstr "Configuración da sala"
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descrición</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Características dos servidores"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
@@ -956,11 +1167,13 @@ msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias da listaxe"
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, 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
-msgid "Shows a list of file transfers between you and other"
+#, 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
@@ -973,9 +1186,10 @@ msgstr ""
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
-msgstr "Cando unha transferencia se completar, amosa unha notificación emerxente"
+msgstr ""
+"Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -983,7 +1197,7 @@ msgstr "_Continuar"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Abrir un cartafol de contido"
 
@@ -1031,7 +1245,7 @@ msgstr "Personalización de temas do Gajim"
 msgid "Gone"
 msgstr "Marchei"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inactivo"
 
@@ -1072,58 +1286,72 @@ msgid "_Background:"
 msgstr "_Fondo"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Cambiar o _alcume"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Cambiar o _tema"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Prema para ver as anteriores conversas nesta sala"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Configurar a sala"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Configurar a sala"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Engadir esta sala aos marcadores"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Engadir esta sala aos marcadores"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Accións"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Deshabilitar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Accións"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Enviar unha mensaxe privada"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1131,22 +1359,19 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Asunto"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1157,92 +1382,98 @@ msgstr ""
 "\n"
 "<b>AVISO:</b>\n"
 "Se ten previsto facer eliminacións masivas, asegúrese de que o Gajim\n"
-"non estea en execución. Xeralmente, evita eliminacións relativas a "
-"contactos con que estiver\n"
+"non estea en execución. Xeralmente, evita eliminacións relativas a contactos "
+"con que estiver\n"
 "a falar neste momento."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Xestor do Historial de Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Xestor do Historial de Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Buscar na base de datos"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Construír unha consulta personalizada"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Historial de conversas"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Construtor de consultas..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Buscar"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Buscar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Denegar"
+#, fuzzy
+msgid "Search:"
+msgstr "Buscar"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Recibiuse un convite"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "Historial de conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Alcume:"
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "Configurar o meu perfil ao me conectar"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "Alcume:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Contrasinal: "
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 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
 msgid "Auto join"
 msgstr "Autoconectar"
@@ -1255,18 +1486,37 @@ msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 msgid "Manage Bookmarks"
 msgstr "Xestionar os marcadores"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Amosar o estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Título:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Configuración da sala"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Propiedades</b>"
@@ -1276,46 +1526,86 @@ msgid "<b>Settings</b>"
 msgstr "<b>Configuración</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Conectar con HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Xestionar os perfís do proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Contrasinal: "
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Usar a autenticación"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+#, fuzzy
+msgid "_Host:"
+msgstr "_Porto:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Engade o contacto á listaxe"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "Cifrado OpenPGP"
+#: ../data/glade/message_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Engadir esta sala aos marcadores"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Accións"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar o _alcume"
 
-#. 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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está a prestar atención á 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 "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1331,40 +1621,77 @@ msgstr "<b>Editor de configuración avanzada</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Programas</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Accións</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Personalizado</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Editar unha regra</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Formato da liña</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Cores do separador para os estados da charla</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opcións de GMail</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificacións visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Personalización da interface</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opcións de GMail</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Listaxe de privacidade</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Propiedades</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificacións visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
-msgid "A_fter nickname:"
-msgstr "Despois do alcume:"
-
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanzado"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1374,48 +1701,27 @@ msgstr ""
 "Só escribindo\n"
 "Desactivado"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 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:18
+#: ../data/glade/preferences_window.glade.h:25
 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:19
-msgid "Also known as iChat style"
-msgstr "Tamén coñecido como estilo iChat"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Como exemplo, se ten activado a mensaxe de estado en ausente, o Gajim non "
-"lle preguntará máis por unha mensaxe de estado cando mude o seu estado a "
-"ausente; simplemente aplicará a mensaxe predefinida para ausente"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Pór _ausente despois de:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Pór _non dispoñíbel despois de:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Detectar automaticamente en cada inicio do Gajim\n"
@@ -1424,105 +1730,76 @@ msgstr ""
 "Usar sempre as aplicacións por defecto do XFCE4\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "B_efore nickname:"
-msgstr "Ant_es do alcume:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Charla"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"Marque esta opción só se alguén que non ten na listaxe está a molestalo. "
-"Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
-"contacto que non estiver na súa listaxe de contactos."
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "Mensaxes de estado por defecto"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:34
-msgid "Default status _iconset:"
-msgstr "Conxunto de _iconas de estado por defecto:"
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "Amosar os detalles _extra nos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display a_vatars of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display status _messages of contacts in roster"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Displayed Chat state noti_fications:"
-msgstr "Notificacións de estado nas charlas:"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "E_very 5 minutes"
-msgstr "Cada 5 _minutos"
-
-#: ../data/glade/preferences_window.glade.h:40
-msgid "Emoticons:"
-msgstr "Emoticonas:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Eventos"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 msgstr ""
-"O Gajim pode enviar e recibir metainformación relacionada cunha "
-"charla que estiver a manter cun contacto. Pode especificar aquí que "
-"estados de charla quere que se amosen nas fiestras."
+"O Gajim pode enviar e recibir metainformación relacionada cunha charla que "
+"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
+"quere que se amosen nas fiestras."
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 msgstr ""
-"O Gajim pode enviar e recibir metainformación relacionada cunha "
-"conversa que estiver a manter cun contacto. Pode especificar aquí que "
-"estados de charla quere enviarlle á outra persoa."
-
-#: ../data/glade/preferences_window.glade.h:44
-msgid "Gajim will automatically show new events by poping up the relative window"
-msgstr "O Gajim amosará automaticamente novos acontecementos a emerxeren na fiestra relativa"
-
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"O Gajim notificaralle novos acontecementos a través dunha mensaxe emerxente no "
-"bordo inferior dereito da pantalla"
+"O Gajim pode enviar e recibir metainformación relacionada cunha conversa que "
+"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
+"quere enviarlle á outra persoa."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
-"pantalla cando un contacto se conectar"
-
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1530,279 +1807,346 @@ msgstr ""
 "O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
 "pantalla cando un contacto se desconectar"
 
-#: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "O Gajim só lle amosará a icona do contacto que provocou o novo acontecemento"
-
 #: ../data/glade/preferences_window.glade.h:50
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente de "
-"correos electrónicos novos"
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
 #: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na listaxe e "
-"nos grupos de charla"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
 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"
+"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
+"de correos electrónicos novos"
 
 #: ../data/glade/preferences_window.glade.h:53
 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"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Se isto está marcado, o Gajim lembrará a posición da listaxe e das fiestras de "
-"conversa na pantalla e os seus tamaños para a próxima vez que aparezan"
 
 #: ../data/glade/preferences_window.glade.h:54
 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...)"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Se isto está marcado, o Gajim empregará iconas específicas para o protocolo- (por exemplo, "
-"un contacto de MSN terá a icona de MSN equivalente para o seu estado en "
-"liña, ausente, ocupado etc.)"
 
 #: ../data/glade/preferences_window.glade.h:55
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
-"Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
-"equivalente en iconas gráficas estáticas ou animadas"
+"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+"listaxe e nos grupos de charla"
 
 #: ../data/glade/preferences_window.glade.h:56
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorar o contido adornado en mensaxes entrantes"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
+"debaixo do nome do contacto na listaxe e en grupos de charla"
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "Ma_nage..."
-msgstr "Xestio_nar..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+"listaxe e nos grupos de charla"
 
 #: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+"listaxe e nos grupos de charla"
+
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Nunca\n"
-"Sempre\n"
-"Por conta\n"
-"Por tipo"
+"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+"listaxe e nos grupos de charla"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Marque esta opción só se alguén que non ten na listaxe está a molestalo. "
+"Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
+"contacto que non estiver na súa listaxe de contactos."
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "Notificar cando un contacto: "
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "Notify on new _GMail email"
-msgstr "Notificar de novos correos de _GMail"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
+"de correos electrónicos novos"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "En cada _mensaxe"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se isto está marcado, o Gajim empregará iconas específicas para o protocolo- "
+"(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
+"estado en liña, ausente, ocupado etc.)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "One message _window:"
-msgstr "Unha soa fiestra de conversa"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Notificacións saíntes do estado de charla:"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
+"equivalente en iconas gráficas estáticas ou animadas"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Play _sounds"
-msgstr "Reproducir _sons"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "Preferencias"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Unha soa fiestra de conversa"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Inserir a hora:"
+msgid "Ma_nage..."
+msgstr "Xestio_nar..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr ""
-"Gardar a _posición e o tamaño para as fiestras de charla e a listaxe de "
-"contactos"
+#, fuzzy
+msgid "Notifications"
+msgstr "Modificar a conta"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Cambiar a mensaxe de estado para reflectir a pista_musical en reprodución"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar cando un contacto: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Amosar só na _listaxe de contactos"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar cando un contacto: "
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Sign _in"
-msgstr "Conectar"
+msgid "Notify on new _GMail email"
+msgstr "Notificar de novos correos de _GMail"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Sign _out"
-msgstr "_Desconectar"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Información persoal"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"Algunhas mensaxes poden incluír un contido adornado (formato, cores "
-"etc). Se isto está marcado, o Gajim amosará a mensaxe en bruto."
+msgid "Play _sounds"
+msgstr "Reproducir _sons"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Status"
-msgstr "Estado"
-
-#: ../data/glade/preferences_window.glade.h:77
-msgid "T_heme:"
-msgstr "Te_ma:"
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "A mensaxe de estado de autoausencia"
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "A mensaxe de estado de non autodispoñíbel"
+msgid "Preferences"
+msgstr "Preferencias"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
-msgstr "_Usar as iconas do transporte"
+msgid "Sign _in"
+msgstr "Conectar"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "Use system _default"
-msgstr "Usar o pre_definido do sistema"
+msgid "Sign _out"
+msgstr "_Desconectar"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Usar a icona na á_rea de notificación"
-
-#: ../data/glade/preferences_window.glade.h:83
 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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
 msgstr ""
-"Cando se recibe un novo acontecemento (mensaxe, envío de ficheiros etc.), "
-"poden usarse os seguintes métodos para o informar. Cómpre salientar que os "
-"acontecementos das mensaxes novas só ocorren se proceden dun contacto con "
-"que non estaba xa a conversar"
+"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:84
-msgid "When new event is received"
-msgstr "Cando se reciba un acontecemento novo"
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Ordenar os contacto_s polo estado"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Estado"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"Funciona para os reprodutores Rythmbox e Muine. Para máis reprodutores, "
-"pode visitar http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Conxunto de _iconas de estado por defecto:"
 
 #: ../data/glade/preferences_window.glade.h:86
-msgid "_Advanced Notifications Control..."
-msgstr "Control de notificacións _avanzadas..."
+#, fuzzy
+msgid "Style"
+msgstr "Atascado"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "_After time:"
-msgstr "_Despois da hora:"
+msgid "T_heme:"
+msgstr "Te_ma:"
 
 #: ../data/glade/preferences_window.glade.h:88
-msgid "_Before time:"
-msgstr "_Antes da hora:"
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Browser:"
-msgstr "_Navegador:"
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_File manager:"
-msgstr "A_dministrador de ficheiros:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "_Usar as iconas do transporte"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_Font:"
-msgstr "_Letra:"
+msgid "Use system _default"
+msgstr "Usar o pre_definido do sistema"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Highlight misspelled words"
-msgstr "_Marcar os erros ortográficos"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Cando se reciba un acontecemento novo"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Pór _ausente despois de:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Incoming message:"
-msgstr "Mens_axe entrante:"
+msgid "_Browser:"
+msgstr "_Navegador:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Log status changes of contacts"
-msgstr "_Rexistrar os cambios de estado dos contactos"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Notificacións de estado nas charlas:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Mail client:"
-msgstr "_Cliente de correo:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticonas:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Nunca"
+msgid "_File manager:"
+msgstr "A_dministrador de ficheiros:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Notificarmo"
+msgid "_Highlight misspelled words"
+msgstr "_Marcar os erros ortográficos"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Open..."
-msgstr "_Abrir..."
+msgid "_Ignore events from contacts not in the roster"
+msgstr ""
+"_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Outgoing message:"
-msgstr "Mensaxe saínte:"
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "_Reprodutor:"
+msgid "_Incoming message:"
+msgstr "Mens_axe entrante:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "_Emerxer"
+msgid "_Log status changes of contacts"
+msgstr "_Rexistrar os cambios de estado dos contactos"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Reset to Default Colors"
-msgstr "_Restabelecer as cores predeterminadas"
+msgid "_Mail client:"
+msgstr "_Cliente de correo:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Sort contacts by status"
-msgstr "Ordenar os contacto_s polo estado"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Pór _non dispoñíbel despois de:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Status message:"
-msgstr "Men_saxe de estado:"
+msgid "_Open..."
+msgstr "_Abrir..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
-msgstr "_URL"
+msgid "_Outgoing message:"
+msgstr "Mensaxe saínte:"
 
 #: ../data/glade/preferences_window.glade.h:107
+msgid "_Reset to Default Colors"
+msgstr "_Restabelecer as cores predeterminadas"
+
+#: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Notificacións de estado nas charlas:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "Men_saxe de estado:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Entrar nun grupo de charla"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Non está na listaxe"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutos"
 
@@ -1838,6 +2182,10 @@ msgstr "Todos"
 msgid "Allow"
 msgstr "Permitir"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Denegar"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "ID de Jabber:"
@@ -1846,7 +2194,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orde:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
@@ -1886,152 +2234,180 @@ msgstr "para me enviar o estado"
 msgid "to view my status"
 msgstr "para ver o meu estado"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Engadir unha regra</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Acerca de"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Imaxe:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Enderezo"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Aniversario:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Imaxe:"
+#: ../data/glade/vcard_information_window.glade.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:6
-msgid "Birthday:"
-msgstr "Aniversario:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Cidade:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Empresa:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "País:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "Correo electrónico:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Segundo enderezo:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Familia:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Personalizado</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Nome:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Páxina web:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Engadir unha regra</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Personalizado</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Alcume:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Medio:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Teléfono:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Máis"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condicións</b>"
+
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, 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:31
-msgid "Personal Info"
-msgstr "Información persoal"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Propiedades</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Teléfono:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, 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
-msgid "Position:"
-msgstr "Posición:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Código postal:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Configuración</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Prefixo"
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Papel:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Acerca de"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Estado:"
+msgid "Click to set your avatar"
+msgstr "Prema para definir a súa circunstancia"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Rúa:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Sufixo:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Información persoal"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Traballo"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Recuperar"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Que quere facer?</b>"
@@ -2044,78 +2420,128 @@ msgstr "Eliminar a _conta unicamente do Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Eliminar"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Pregunta para ver o _seu estado"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Engadir unha _notificación especial"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Asignar chave de OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Editar os grupos"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Executar o comando..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Con_vidar"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaxe"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Eliminar"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Envía XML personalizado"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Enviar unha _mensaxe..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Enviar ficheiro"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar a charla"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Permitirlle ver o meu estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirlle ver o meu estado"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Eliminar da listaxe"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Renomear o contacto"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "Renomear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Subscrición"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "nove"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Contas"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Engadir un contacto..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Engadir un _contacto"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Características dos servidores"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2129,51 +2555,91 @@ msgstr "Preguntas frecuentes (en liña)"
 msgid "Help online"
 msgstr "Axuda en liña"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Perfil, Ima_xe"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Amosar os trans_portes"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Amosar os contactos desconectados"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Amosar _listaxe"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Contidos"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Descubrir os servizos"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Accións"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Contidos"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Enviar unha _mensaxe..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Ver"
 
+#: ../data/glade/search_window.glade.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
+msgid "Search"
+msgstr "Buscar"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Engadir un _contacto"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Información"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Buscar"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "I_r"
@@ -2182,10 +2648,6 @@ msgstr "I_r"
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtro:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Rexistrar en"
@@ -2243,11 +2705,15 @@ msgid "Au_thorize"
 msgstr "Au_torizar"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, 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
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, fuzzy
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr ""
 "Denegar a autorización do contacto para que non poida saber cando estou "
 "conectado"
@@ -2260,10 +2726,31 @@ msgstr "Solicitude de subscrición"
 msgid "_Deny"
 msgstr "_Denegar"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Amosar todos os _eventos pendentes"
@@ -2276,57 +2763,73 @@ msgstr "Amosar _listaxe"
 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:5
-msgid "Ask:"
-msgstr "Pregunta:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Accións</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Cliente:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "ID de Jabber:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Recurso:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Configuración</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrición</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Personalizado</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Configurar a sala"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "SO:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Recurso:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Estado:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Subscrición:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Máis"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "Historial de conversas"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Imaxe:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2336,11 +2839,6 @@ msgstr "<b>Tráfico de Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2359,15 +2857,29 @@ msgstr "_Mensaxe"
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Nome:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Engadir unha _notificación especial"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Apelido(s):"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Asignar chave de OpenPGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Editar os grupos"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "Renomear"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Modificar a conta..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2377,242 +2889,3037 @@ msgstr "JID local"
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Recurso:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Estado:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Modificar conta"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Usar o porto personalizado:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Información"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "Activo"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "Inactivo"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "No grupo"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr ""
 
-#: ../src/advanced.py:57
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
+
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nome da opción"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ningún)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Oculta"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Belarusian"
+msgstr "Búlgaro"
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "British"
+msgstr "Bretón"
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Éuscaro"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian (b)"
 msgstr "Noruegués b"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian"
 msgstr "Noruegués"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Portugués do Brasil"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Alemán"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chinés (Ch)"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Se esta non é a súa lingua para a quere marcar os erros ortográficos, "
-"debe definir a variábel $LANG co valor apropiado. Por exemplo, para o "
-"Francés debe exportar LANG=fr_FR ou exportar LANG=fr_FR.UTF-8 en ~/.bash_profile ou "
-"facelo globalmente en /etc/profile.\n"
-"\n"
-"A marcación de erros ortográficos non se empregará"
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Idioma do corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:844
-msgid "Chats"
-msgstr "Charlas"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Cifrado activado"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:1030
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" por %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Cifrado desactivado"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Usar a autenticación"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Usar a autenticación"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s non difundiu a súa chave de OpenPGP nin vostede lle asignou unha"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "Cifrado activado"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Comandos: %s"
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Uso: /%s, limpa o texto da fiestra."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Uso: /%s, oculta os botóns de charla."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
+"terceira persoa. (por exemplo /%s berra.)"
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Uso: /%s, oculta os botóns de charla."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Non hai información de axuda para /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Esta mensaxe está cifrada]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "Non está na listaxe"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Esta mensaxe está cifrada]"
+
+#: ../src/chat_control.py:1854
+#, 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:1545
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
-"Se pecha este separador e ten o historial desactivado, esta mensaxe perderase."
+"Se pecha este separador e ten o historial desactivado, esta mensaxe "
+"perderase."
 
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "a crear a base de datos de rexistros"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s é un ficheiro mais podería ser un directorio"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim pecharase agora"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s é un directorio mais podería ser un ficheiro"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "a crear un directorio %s"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Información"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Un contacto cambiou o seu estado"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Libre para falar"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "nove"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+#, fuzzy
+msgid "Do not disturb"
+msgstr "Non molestar."
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Descrición do erro..."
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Novo grupo de charla"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s da sala %(room_name)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "%s entrou no grupo de charla"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Grupos de charla"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Xa está na sala %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d mensaxe sen ler"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Usar DBus e o notificador Daemon para amosar as notificacións"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tempo en minutos, despois de cambiar a ausente"
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Ausente por inactividade"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Non dispoñíbel por inactividade"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+# duda sobre collapsed
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Por defecto"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Activar a mensaxaría de ligazón local / zeroconf"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Idioma que emprega o corrector"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'sempre' - amosar a hora en cada mensaxe.\n"
+"'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
+"'nunca' - nunca amosar a hora."
+
+#: ../src/common/config.py:121
+#, fuzzy
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Amosar a hora nas charlas co Fuzzy Clock. Valor do fuzziness desde 1 a 4 ou "
+"0 para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos "
+"preciso. So se emprega se está conectado print_time 'ás veces'"
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
+"eliminar * *"
+
+#: ../src/common/config.py:128
+#, fuzzy
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
+"seleccionado (se quere usalo, instale o docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Carácter para engadir despois do alcume cando se usa o completado de alcume "
+"(tab) nos grupos de charla."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Carácter para propor para engadir logo do alcume desexado cando alguén está "
+"a empregalo no grupo de conversa."
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Engadir * e [n] no título da listaxe?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Cantas liñas quere lembrar da última charla cando se volve abrir un "
+"separador/fiestra de charla"
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Cantos minutos debe durar a última liña da conversa anterior."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
+"cliente de Mirabilis ICQ)"
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
+"significa usar o wiktionary"
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Se é verdadeiro, escoite os sinais D-Bus de NetworkManager e os cambios do "
+"estado das contas (con tal de que non teñan o listen_to_network_manager "
+"posto en Falso e sincronicen co estado global) baseados no estado daconexión "
+"da rede."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Enviáronse as notificacións de estado. Pode ser all, composing_only o "
+"disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
+"todo, só_compor ou desactivado."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
+"cada x minutos."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
+"nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Non preguntar nunca antes de pechar a fiestra/separador dun grupo de charla "
+"nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
+"tradución do enderezo ou o redirección de portos."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Notifica acontecementos na área de notificación."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Quere amosar o separador cando só hai unha conversa?"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr ""
+"Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Quere amosar o botón de pechar no tabulador?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
+"de charla."
+
+#: ../src/common/config.py:219
+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 ""
+"Se é verdadeiro, peche o Gajim cando se preme o botón X do xestor de "
+"fiestras. Esta preferencia só se activa se se usa a icona da área de "
+"notificación. "
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña "
+"mensaxes sen ler. A depender do tema, esta icona pode ser animada."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
+"para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Se é verdadeiro, o Gajim pediralle unha circunstancia a cada contacto que "
+"non tivo unha circunstancia a última vez ou se ten gardada unha demasiada "
+"antiga."
+
+#: ../src/common/config.py:229
+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 ""
+"Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
+"cambie o seu estado ou a súa mensaxe de estado"
+
+#: ../src/common/config.py:230
+#, fuzzy
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"pode ser \"none\", \"all\" ou \"in_and_out\". Se é \"none\", Gajim non "
+"volverá mostrar a liña de estado nos grupos de conversa cando un membro "
+"cambie a súa mensaxe de estado. Se é \"all\" o Gajim amosará todos as "
+"mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
+"saídas no grupo de conversa."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Cor de fondo para os contactos que acaban de se conectar."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Cor de fondo para os contactos que acaban de se desconectar."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Se é verdadeiro, as mensaxes restauradas usarán unha fonte máis pequena que "
+"a predefinida."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Non amosar a circunstancia para o transporte en si mesmo"
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Non amosar a listaxe na barra de tarefas."
+
+#: ../src/common/config.py:238
+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 ""
+"Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
+"2.8, resalta a fiestra cando hai eventos pendentes."
+
+#: ../src/common/config.py:240
+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 ""
+"A Jabberd1.4 non lle gusta a información SHA cando se entra nun grupo de "
+"charla protexido por contrasinal. Cambie esta opción a Falso para deter o "
+"envío de información SHA no grupo de charla."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Controla a fiestra onde se colocan as novas mensaxes.\n"
+"'sempre' - Todas as mensaxes son enviadas a unha fiestra única.\n"
+"'nunca' - Todas as mensaxes obteñen a súa propia fiestra.\n"
+"'porconta' - As mensaxes para cada conta envíanse a unha fiestra "
+"específica.\n"
+"'portipo' - Cada tipo de mensaxe (por exemplo, charlas vs. grupos de charla) "
+"envíase a unha fiestra específica. Nota: cambie esta opción require "
+"reiniciar o Gajim para que os cambios teñan efecto."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+"Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Oculta os botóns nas fiestras de grupo de charla."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Oculta o báner nunha fiestra de grupo de charla"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
+
+#: ../src/common/config.py:250
+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 ""
+"Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
+"persoa a que enviou a última mensaxe."
+
+#: ../src/common/config.py:251
+#, fuzzy
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Enviar a mensaxe e pechar a fiestra"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
+"charla."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
+"ler."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Débese amosar a confirmación da creación de metacontactos ou non? Unha "
+"secuencia baleira significa que nunca se amosará."
+
+#: ../src/common/config.py:256
+#, fuzzy
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Se é verdadeiro, poderá definir unha prioridade negativa á súa conta na "
+"fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
+"prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
+"están definidas nas opcións de autoprioridade_*"
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Corrección Jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
+"opción file_transfer_proxies para a súa transferencia."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Está o OpenPGP activado para este contacto?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Lingua en que se comprobarán os erros ortográficos"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "estado separado por espazos ou all"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'si', 'non' ou 'ambos'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'si', 'non' ou ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "A durmir"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Volvo axiña"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Volvo nuns minutos."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "A comer"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Estou a comer, déixeme unha mensaxe."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Filme"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Estou a ver un filme."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "A traballar"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Estou a traballar."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Teléfono"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Estou a falar por teléfono."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Fóra"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Estou fóra a gozar da vida."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Estou dispoñíbel."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Estou libre para falar."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Volvo axiña"
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Non estou dispoñíbel."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Non molestar."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Adeus!"
+
+#: ../src/common/config.py:441
+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 ""
+"Son para reproducir cando unha mensaxe de grupo de charla contén unha das "
+"palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
+"contén o teu alcume."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Son para reproducir cando chega calquera mensaxe MUC"
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "verde"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "ultramariño"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "humano"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "mariño"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Non se pode cargar o módulo inactivo"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Host errado"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "A información de rexistro para o transporte %s non chegou a tempo"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Extensión non admitida"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Alcume non permitido: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Non se puido entrar no grupo de charla"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Está expulsado deste grupo de charla."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Non existe o grupo de charla."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "A creación de grupos de charla está restrinxida."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "É necesario usar o alcume rexistrado."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Non está na listaxe de membros"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Eliminouse a autorización"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "estamos agora subscritos a %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "solicitude de eliminación de subscrición de %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "xa non estamos subscritos a %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"A ID de Jabber %s non cumpre a norma RFC. Non se engadirá á súa listaxe de "
+"contactos. Use as ferramentas de xestión de listaxe de contactos roster como "
+"http://jru.jabberstudio.org/ para o eliminar"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Non se facilitou a chave de OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Conectarase a %s sen o OpenPGP"
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Non se pode cargar o módulo inactivo"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Perdeuse a conexión da conta \"%s\""
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Reconectar manualmente."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "A resposta non é válida"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Fallou a conexión"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Non se pode conectar a \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Comprobe a súa conexión ou probe máis tarde."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Non se pode conectar a \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Perdeuse a conexión da conta \"%s\""
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Comprobe a súa conexión ou probe máis tarde"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Fallou a autenticación con \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr ""
+"Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os "
+"correctos."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "Erro ao engadir o servizo. %s"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Asunto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Non se conseguiu debido ao estado invisíbel"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observadores"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "Non está na listaxe"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "As ligazóns D-Bus de python non se achan neste computador"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "falta a dependencia pysqlite2 (tcc python-pysqlite2). A saír..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "O nome da conta non pode estar baleiro."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"O servizo non está dispoñíbel: o Gajim non se está a executar, ou "
+"remote_control está en Falso"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"O bus da sesión non está dispoñíbel.\n"
+"Probe a ler http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "unha"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "dúas"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tres"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "catro"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "cinco"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "seis"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "sete"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "oito"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "nove"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "dez"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "once"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "doce"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "$0 o'clock"
+msgstr "%0 en punto"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "five past $0"
+msgstr "%0 e cinco"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "%0 e dez"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "quarter past $0"
+msgstr "%0 e cuarto"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty past $0"
+msgstr "%0 e vinte"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty five past $0"
+msgstr "%0 e vinte e cinco"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "half past $0"
+msgstr "%0 e media"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "%1 menos vinte e cinco"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "%1 menos vinte"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "%1 menos cuarto"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "%1 menos dez"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "%1 menos cinco"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#, fuzzy
+msgid "$1 o'clock"
+msgstr "%1 en punto"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Noite"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Madrugada"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Mañá"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Media mañá"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Mediodía"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Tarde"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Serán"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Noite"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Comezo da semana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Metade de semana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Final de semana"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Fin de semana!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Hai un caracter non válido no nome de usuario."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "É necesario o enderezo do servidor."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Carácter non válido no nome do host."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Carácter non válido no recurso."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Ocupado"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Ocupado"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Non dispoñíbel"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Libre para falar"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Libre para falar"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "En liñ_a"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "En líña"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Conectando"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "A_usente"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "D_esconectado"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Invisíbel"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Descoñecido"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Ten erros"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Ningunha"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "A"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Ambos"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Ningunha"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "_Engadir"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Ningún"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderadores"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderador"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Participantes"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Participante"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Visitantes"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Visitante"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Ningún"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Propietario"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Membro"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "está a prestar atención á conversa"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "está a facer algo máis"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "está a escribir..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "Parou de escribir"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "pechou a fiestra de charla"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Enviar a mensaxe"
+msgstr[1] "Enviar a mensaxe"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "erro: non se pode abrir %s para lectura"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "ciano"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "migrando os rexistros da base de datos aos índices"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Conta de Gajim %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pausado"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Negra"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Ten "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Charlas"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Negra"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Contidos"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Completado"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Contidos"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Inactivo"
+
+#: ../src/common/pep.py:49
+msgid "Curious"
+msgstr ""
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Eliminar"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Desactivado"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
 msgstr "Desactivado"
 
-#: ../src/config.py:221
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Desactivado"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+msgid "Hot"
+msgstr ""
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "mensaxe"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Invisíbel"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "unha"
+
+#: ../src/common/pep.py:81
+msgid "Lost"
+msgstr ""
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Alemán"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Modificar"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Desconectado"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "once"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Atascado"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Última modificación:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Alcume"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "A durmir"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Rúa:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Engadiuse"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Hora"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "nove"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Host errado"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Serán"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "A compor"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Mañá"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "todos no grupo"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "A traballar"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Serán"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "A expulsar %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Entrar"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "A traballar"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "A traballar"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "A comer"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Cambiando o asunto"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "A expulsar %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "A comer"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "A traballar"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "A expulsar %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "A comer"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Desconectar"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "A comer"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Motivo"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Motivo"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "A durmir"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "A traballar"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "A comer"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Estou a ver un filme."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "A comer"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Estou a falar por teléfono."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "A transferir"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "A compor"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "_Abrir como ligazón"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "A traballar"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "A compor"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "A traballar"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Non se pode conectar ao porto %s."
+
+#: ../src/common/socks5.py:85
+#, fuzzy
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"É posíbel que outra instancia do Gajim estea a se executar. A transferencia "
+"cancelarase."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Non foi posíbel estabelecer a conexión ao host: expirou cando enviaba a "
+"información."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"O host que configurou como a opción avanzada ft_override_host_to_send non é "
+"valido e ignorarase."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "Para continuar a enviar e recibir mensaxes, precisa volver conectarse."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Erro de Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Cada %s _minutos"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"A mensaxaría de ligazón local podería non funcionar correctamente."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Por favor, comprobe se o Avahi está instalado."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Non foi posíbel iniciar o servizo local"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Non foi posíbel ligar ao porto %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Por favor, comprobe se o avahi-daemon está en execución."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido "
+"enviar "
 
-#: ../src/config.py:363
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Esta mensaxe está cifrada]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Erro ao engadir o servizo. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Mensaxes de estado por defecto"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Activar"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizado</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2621,73 +5928,109 @@ 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:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:1074
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Recibiuse unha mensaxe nova"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Quere reconectarse agora?"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Se quere que se apliquen todos os cambios instantaneamente, debe "
+"reconectarse."
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Acontecementos sen ler"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Comezou unha charla coa conta %s"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr "Acontecementos sen ler"
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 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:1344
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2695,177 +6038,147 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Xestionar as contas"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Introduza un nome novo para o grupo %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 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:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr "Volvo axiña"
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr "Quere reconectarse agora?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
 
-#: ../src/config.py:1566
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Elixa a súa chave de OpenPGP"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 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:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 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:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 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:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Produciuse un erro ao obter as chaves secretas"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
-
-#: ../src/config.py:1634 ../src/config.py:3427
-msgid "OpenPGP Key Selection"
-msgstr "Selección da chave de OpenPGP"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Elixa a súa chave de OpenPGP"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Servidor"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
-
-#: ../src/config.py:1969
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Comezou unha charla coa conta %s"
-
-#: ../src/config.py:1970
-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:2029
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 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."
+"Por favor, volva darlle nome ou elimíneo antes de habilitar a mensaxaría de "
+"ligazón local."
 
-#: ../src/config.py:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2873,11 +6186,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2885,23 +6198,24 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
+#, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2909,7 +6223,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2925,373 +6239,492 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Todos"
+
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:2749
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2792
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrese de cubrir os campos de servidor e de sala ou elimine "
 "este marcador."
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "O contrasinal non é válido"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Debe introducir un contrasinal para a conta nova"
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "Os contrasinais non coinciden"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber duplicada"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta xa está configurada no Gajim."
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 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."
+"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:3100
-msgid "Your new account has been created successfully"
-msgstr "A súa conta nova creouse con éxito"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Especifique o novo alcume que quere usar:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "O contacto xa está na listaxe"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "A súa conta nova creouse con éxito"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 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:342
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Onte"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "hai %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Cliente de MI de Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "No grupo"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Chave ID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nome de contacto"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Definir a MDD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Mensaxe de estado"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
+"nome."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
-"Por favor, introduza a información do contacto que quere engadir á "
-"conta %s"
+"Por favor, introduza a información do contacto que quere engadir á conta %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:906
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Non se pode conectar ao porto %s."
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
+"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 ""
-"É posíbel que outra instancia do Gajim estea a se executar. A transferencia "
-"cancelarase."
+"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:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, 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:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 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:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 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."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Servidor"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "A conta \"%s\" está conectada ao servidor"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Non pode entrar nunha sala de charla até que non se conecte."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3300,477 +6733,846 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "O contrasinal non é válido"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Os contrasinais non coinciden"
+
+#: ../src/dialogs.py:2025
+msgid "The passwords typed in both fields must be identical."
+msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Mensaxe nova"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:1887
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, 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:1890
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
-#, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Está expulsado deste grupo de charla."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2968
+#, fuzzy, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
+msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
+
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "núm."
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "cando estea "
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Outros"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transportes"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 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:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
-"Non hai servizo neste enderezo ou non está a responder. "
-"Comprobe o enderezo e ténteo máis tarde."
+"Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
+"e ténteo máis tarde."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 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:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "Executar o _comando..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ningún"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Historial"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Enviouse a mensaxe"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Cifrado OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Mens_axe entrante:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Xeral"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Características dos servidores"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vostede"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "Cancelouse a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Non se puido estabelecer a conexión co cliente."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "O contacto detivo a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Elixa un ficheiro para enviar..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Descrición: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Outro proceso está a usar este ficheiro."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Descrición: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quere enviarlle un ficheiro:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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"
+"Xa existe un ficheiro con este nome e non ten permiso para o sobreescribir"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Que quere facer?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Gardar o ficheiro como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(horas)02.d:%(minutos)02.d:%(segundos)02.d"
@@ -3778,60 +7580,70 @@ msgstr "%(horas)02.d:%(minutos)02.d:%(segundos)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "O ficheiro non é válido"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "O Gajim precisa un GTK 2.6 ou superior"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "A biblioteca GTK+ precisa un soporte de libglade"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3840,21 +7652,22 @@ msgstr ""
 "Por favor, elimine a súa biblioteca GTK+ actual e instale a última versión "
 "estábel desde %s"
 
-#: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:199
+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:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "O Gajim precisa un PySQLite2 para funcionar"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa un pywin32 para funcionar"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3864,11 +7677,11 @@ msgstr ""
 "obtelo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "O Gajim xa está a se executar"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3876,396 +7689,640 @@ msgstr ""
 "Outra instancia dO Gajim semella estar xa en execución\n"
 "Quere executar unha outra?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autorización HTTP (%s) para %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "É necesario o contrasinal"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: ../src/gajim.py:347
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "O contrasinal é incorrecto"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"O seu alcume da súa preferencia está en uso ou rexistrado por outro "
+"ocupante. \n"
+"Por favor, especifique outro alcume abaixo:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Acepta esta solicitude?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "Autorización HTTP (%s) para %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gajim.py:706
-#, python-format
-msgid "Subject: %s"
-msgstr "Asunto: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "Sempre o verá desconectado."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Comprobe a súa conexión ou probe máis tarde."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s coñéceselle como %s"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s está agora %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "O contrasinal é incorrecto"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "É necesario un contrasinal para entrar a este grupo de charla."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "O contrasinal é incorrecto"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"De: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recibiu con éxito o ficheiro %(ficheiro)s de %(nome)s."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(ficheiro)s de %(nome)s."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "En cada _mensaxe"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Conflito co nome de usuario"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Conexión"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Non me preguntar outra vez"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Cifrado desactivado"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: ../src/gajim.py:2090
-msgid "Network Manager support not available"
-msgstr "O soporte para o xestor de rede non está dispoñíbel"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "O marcador xa se definiu"
+
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "A sala \"%s\" xa está nos seus marcadores."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "O marcador engadiuse con éxito"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "O soporte de manexo de sesión non está dispoñíbel (falta o módulo gnome.ui)"
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:78
-msgid "Popups a window with the next pending event"
+#: ../src/gajim-remote.py:91
+#, fuzzy
+msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "mensaxe"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 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 ""
-"cambia o estado da conta \"account\". Se non se especifica, probe a "
-"cambiar o estado de todas as contas que teñen a opción \"sync with "
-"global status\" activada"
+"cambia o estado da conta \"account\". Se non se especifica, probe a cambiar "
+"o estado de todas as contas que teñen a opción \"sync with global status\" "
+"activada"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Amosa o diálogo de charla para enviarlle mensaxes a un contacto"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 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 ""
-"Envía unha mensaxe nova de charla a un contacto na listaxe. Tanto a "
-"chave de OpenPGP como a conta son opcionais. Se quere definir só "
-"'conta' sen 'chave pgp', só defina 'chave pgp' a ''."
+"Envía unha mensaxe nova de charla a un contacto na listaxe. Tanto a chave de "
+"OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
+"pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se se especifica, a mensaxe cifrarase mediante a súa chave pública"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 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 ""
-"Envíalle unha mensaxe nova a un contacto na listaxe. Tanto a chave de OpenPGP "
-"como a conta son optativas. Se quere definir só 'conta' sen 'chave "
+"Envíalle unha mensaxe nova a un contacto na listaxe. Tanto a chave de "
+"OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID do contacto que recibirá a mensaxe"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
+msgstr ""
+"a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe o estado actual da preferencias do Gajim para o ficheiro de "
 "configuración"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Engade o contacto á listaxe"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Engade un contacto novo a esta conta."
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: ../src/gajim-remote.py:207
-msgid "Returns current status message (the global one unless account is specified)"
+#: ../src/gajim-remote.py:231
+msgid ""
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devolve a mensaxe de estado actual (o global se non se especificar unha "
 "conta)"
 
-#: ../src/gajim-remote.py:214
-msgid "Returns number of unreaded messages"
+#: ../src/gajim-remote.py:238
+#, fuzzy
+msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre o diálogo de iniciar charla"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Iniciar unha charla con esta conta"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4273,11 +8330,75 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+msgid "Join a MUC room"
+msgstr ""
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Sala:"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "Alcume"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "Contrasinal: "
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Os contrasinais non coinciden"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Por favor, comprobe se o avahi-daemon está en execución."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4286,29 +8407,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:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote.py:335
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Modo de uso: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4317,142 +8440,202 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../src/gajim-remote.py:420
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
+"O argumento \"%s\" non se especificou. \n"
+"Escriba \"%s help %s\" para máis información"
+
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host errado"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Non pode eliminar o tema actual"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Non pode eliminar o tema actual"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Charla privada"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Charlas privadas"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:152
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
+msgstr ""
+"Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
+
+#: ../src/groupchat_control.py:451
+msgid "Insert Nickname"
+msgstr "Introducir alcume"
+
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Historial de conversas"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Conexión"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
 #, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
-msgstr "Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Grupos de charla"
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Grupos de charla"
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:318
-msgid "Insert Nickname"
-msgstr "Introducir alcume"
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, 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:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Afiliación:"
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s coñéceselle como %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:936
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s foi expulsado por %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s está agora %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "O nome de usuario non é válido"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Este grupo de charla non ten un asunto"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s convidouse a %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s non semella ser un JID válido"
-
-#: ../src/groupchat_control.py:1227
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Non existe este comando: /%s (se quere enviar isto, use o prefixo /say)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4461,259 +8644,248 @@ msgid ""
 "NOT support spaces in nickname."
 msgstr ""
 "Uso: /%s <alcume|JID> [motivo], expulsa o JID do grupo de charla. O alcume "
-"dun ocupante pode ser substituído, mais non se contén \"@\". Se o JID "
-"está actualmente no grupo de charla, el/ela será tamén "
-"expulsado. NON se admiten espazos no alcume."
+"dun ocupante pode ser substituído, mais non se contén \"@\". Se o JID está "
+"actualmente no grupo de charla, el/ela será tamén expulsado. NON se admiten "
+"espazos no alcume."
 
-#: ../src/groupchat_control.py:1259
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr ""
-"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante "
-"especificado."
-
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, limpa o texto da fiestra."
+"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
-"Uso: /%s [motivo], pecha a fiestra ou o separador actual e amosa o motivo "
-"se se especificar."
-
-#: ../src/groupchat_control.py:1268
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, oculta os botóns de charla."
+"Uso: /%s [motivo], pecha a fiestra ou o separador actual e amosa o motivo se "
+"se especificar."
 
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
-"Uso: /%s <JID> [reason], convida o JID ao grupo de charla actual, "
-"e opcionalmente especifica un motivo."
+"Uso: /%s <JID> [reason], convida o JID ao grupo de charla actual, e "
+"opcionalmente especifica un motivo."
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
-"Uso: /%s <sala>@<servidor>[/alcume], ofrece a entrada a sala@servidor "
-"e usa opcionalmente o alcume especificado"
+"Uso: /%s <sala>@<servidor>[/alcume], ofrece a entrada a sala@servidor e usa "
+"opcionalmente o alcume especificado"
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
 "from the group chat and optionally displays a reason. Does NOT support "
 "spaces in nickname."
 msgstr ""
-"Uso: /%s <alcume> [motivo], elimina da sala o ocupante que especifica"
-"o alcume e opcionalmente especifica un motivo. NON se admiten espazos no alcume."
-
-#: ../src/groupchat_control.py:1284
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
-"terceira persoa. (por exemplo /%s berra.)"
+"Uso: /%s <alcume> [motivo], elimina da sala o ocupante que especificao "
+"alcume e opcionalmente especifica un motivo. NON se admiten espazos no "
+"alcume."
 
-#: ../src/groupchat_control.py:1288
-#, python-format
+#: ../src/groupchat_control.py:1692
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Uso: /%s <alcume> [message], abre unha fiestra de charla privada e envíalle "
 "unha mensaxe ao ocupante que especifica o alcume."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tema], amosa ou actualiza o asunto actual da sala."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaxe>, envía unha mensaxe sen buscar outros comandos."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "Non hai información de axuda para /%s"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, 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:1358
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1839
+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:1362 ../src/roster_window.py:3962
-msgid "Do _not ask me again"
-msgstr "_Non me preguntar outra vez"
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "O marcador xa se definiu"
-
-#: ../src/groupchat_control.py:1433
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "A sala \"%s\" xa está nos seus marcadores."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "O marcador engadiuse con éxito"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-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/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Detectouse un erro de programación"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 "Probabelmente non é crítico mais, porén, debe informarse aos desenvolvedores."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Informar do erro"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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á"
+msgstr ""
+"Non se pode escribir en %s. O soporte de manexo de sesión non funcionará"
+
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+msgid "Gajim is not the default Jabber client"
+msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:734
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, 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:738
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Contactos"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Alcume"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
-"Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ "
-"EN EXECUCIÓN)"
+"Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
+"EXECUCIÓN)"
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 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 "
@@ -4722,144 +8894,182 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 "Normalmente, o tamaño que se lle asigna á base de datos non se libera; "
-"simplemente volve poder usarse. Se o que quere é reducir o tamaño da "
-"base de datos, elixa SI; caso contrario, elixa NON.\n"
+"simplemente volve poder usarse. Se o que quere é reducir o tamaño da base de "
+"datos, elixa SI; caso contrario, elixa NON.\n"
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "A exportar o historial..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 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] "Está seguro de que quere eliminar o historial do contacto que seleccionou?"
-msgstr[1] "Está seguro de que quere eliminar o historial dos contactos que seleccionou?"
+msgstr[0] ""
+"Está seguro de que quere eliminar o historial do contacto que seleccionou?"
+msgstr[1] ""
+"Está seguro de que quere eliminar o historial dos contactos que seleccionou?"
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Esta é unha operación irreversíbel"
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está agora %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Charlas"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Grupos de charla"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Charlas privadas"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensaxe privada desde o grupo de charlas %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Xeral"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr "Prema para definir a súa circunstancia"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Camiño do ficheiro"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Non existe o grupo de charla."
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sen unha conexión non pode publicar a súa información de contacto."
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "A enviar o perfil..."
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr "Información publicada"
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4867,436 +9077,545 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "Sen unha conexión non pode obter a súa información de contacto."
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Observadores"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Enviouse a autorización"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "a usar a conta %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
-#, python-format
-msgid "to %s account"
-msgstr "á conta %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Enviouse a solicitude de subscrición"
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "a usar a conta %s"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#. profile, avatar
-#: ../src/roster_window.py:983
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Eliminouse a autorización"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "da conta %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:1003
-msgid "_Manage Bookmarks..."
-msgstr "Xestionar _marcadores..."
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "para a conta %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1053
-msgid "History Manager"
-msgstr "Historial"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+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:1062
-msgid "_Join New Group Chat"
-msgstr "_Entrar nun outro grupo de charla"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
+"de charla. Está seguro de que quere ser invisíbel?"
+
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
+"historial activado"
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
-msgstr "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
+msgstr ""
+"Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:1393
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
-"Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: %"
-"s"
+"Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
+"%s"
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, 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:1478
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, 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:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-msgid "_New group chat"
-msgstr "_Grupo de charla novo"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-msgid "Send Group M_essage"
-msgstr "Enviar mensaxe ao grupo"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "Re_nomear"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr "A todos os usuarios"
-
-#: ../src/roster_window.py:2061
-msgid "To all online users"
-msgstr "A todos os usuarios en liña"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "_Conectar"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "_Desconectar"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "_Cambiar a mensaxe de estado"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "Enviouse a autorización"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Agora \"%s\" poderá saber o seu estado."
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "Enviouse a solicitude de subscrición"
-
-#: ../src/roster_window.py:2394
-#, 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:2406
-msgid "Authorization has been removed"
-msgstr "Eliminouse a autorización"
-
-#: ../src/roster_window.py:2407
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Agora \"%s\" sempre o/a verá desconectado."
-
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr ""
-"Ao eliminar este contacto tamén se eliminará a autorización "
-"resultante e el/ela sempre o/a verá desconectado."
+"Ao eliminar este contacto tamén se eliminará a autorización resultante e el/"
+"ela sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Que quere facer?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr ""
-"Ao eliminar este contacto tamén se eliminará a autorización. Este "
-"contacto sempre o/a verá desconectado."
+"Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
+"sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:3144
 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:2631
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Ao eliminar estes contactos: %s\n"
-"tamén eliminará as autorizacións resultantes e eles/elas sempre o/a "
-"verán desconectado."
+"tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
+"desconectado."
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Conectarase a %s sen o OpenPGP"
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "É necesario o contrasinal"
-
-#: ../src/roster_window.py:2711
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Introduza o contrasinal GPG para a conta %s"
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Gardar o contrasinal"
-
-#: ../src/roster_window.py:2724
-msgid "Wrong Passphrase"
-msgstr "O contrasinal é incorrecto"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-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:2783 ../src/roster_window.py:2843
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 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:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" por %(artist)s"
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
-"historial activado"
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
-"O seu servidor non admite almacenar información de metacontactos. Por tanto, toda a "
-"información referente non se gardará na próxima reconexión."
+"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:3956
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:3784
+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:3958
+#: ../src/roster_window.py:3786
+#, fuzzy
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"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 ""
 "Os metacontactos son unha forma de reagrupar varios contactos nunha liña. "
-"Xeralmente se usan cando a mesma persoa ten varias contas de Jabber "
-"ou contas de transportes."
+"Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
+"contas de transportes."
 
-#: ../src/roster_window.py:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "O ficheiro non é válido"
+
+#: ../src/roster_window.py:3910
+#, 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:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "a usar a conta %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "á conta %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "a usar a conta %s"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "Xestionar _marcadores..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Deixar %s no grupo %s"
+msgid "of account %s"
+msgstr "da conta %s"
 
-#: ../src/roster_window.py:4132
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Facer %s e %s metacontactos"
+msgid "for account %s"
+msgstr "para a conta %s"
 
-#: ../src/roster_window.py:4319
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Cambiar a mensaxe de estado"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publicar"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Activo"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Descubrir os servizos..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Enviar mensaxe ao grupo"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "A todos os usuarios"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "A todos os usuarios en liña"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Renomear o contacto"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Enviar mensaxe"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportes"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Amosar os trans_portes"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contacto desconectado"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Novo grupo de charla"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Historial"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Entrar nun outro grupo de charla"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Asunto: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Conexión"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Contacto desconectado"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Subscrición: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Sala:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Activo"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipo:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Detido"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servizo non respondeu aínda con información detallada"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5304,1330 +9623,485 @@ msgstr ""
 "Este servizo podería non responder con información detallada.\n"
 "Posibelmente é antigo ou está roto"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Afiliación:"
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
-"Este contacto está interesado na información da súa presenza, mais vostede non "
-"o está na súa"
+"Este contacto está interesado na información da súa presenza, mais vostede "
+"non o está na súa"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
-"Está interesado na información da presenza do contacto, mais el/"
-"ela non o está en vostede"
+"Está interesado na información da presenza do contacto, mais el/ela non o "
+"está en vostede"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
-"Tanto vostede como o contacto están interesados na información da "
-"presenza do outro"
+"Tanto vostede como o contacto están interesados na información da presenza "
+"do outro"
 
 #. None
-#: ../src/vcard.py:291
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
-"Non está interesado na presenza do contacto e el/ela tampouco o está "
-"en vostede"
+"Non está interesado na presenza do contacto e el/ela tampouco o está en "
+"vostede"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Está a agardar a resposta do contacto sobre a súa solicitude de subscrición"
-
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " recurso con prioridade "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "a crear a base de datos de rexistros"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "%s é un ficheiro mais podería ser un directorio"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim pecharase agora"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "%s é un directorio mais podería ser un ficheiro"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "a crear un directorio %s"
-
-#: ../src/common/config.py:55
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Usar DBus e o notificador Daemon para amosar as notificacións"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tempo en minutos, despois de cambiar a ausente"
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "Ausente por inactividade"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "Non dispoñíbel por inactividade"
-
-# duda sobre collapsed
-#: ../src/common/config.py:82
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Activar a mensaxaría de ligazón local / zeroconf"
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr "Idioma que emprega o corrector"
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'sempre' - amosar a hora en cada mensaxe.\n"
-"'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
-"'nunca' - nunca amosar a hora."
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr "Amosar a hora nas charlas co Fuzzy Clock. Valor do fuzziness desde 1 a 4 ou 0 "
-"para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos preciso. "
-"So se emprega se está conectado print_time 'ás veces'"
-
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
-
-#: ../src/common/config.py:96
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen eliminar "
-"* *"
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-"Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
-"seleccionado (se quere usalo, instale o docutils)"
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Carácter para engadir despois do alcume cando se usa o completado de alcume (tab) nos "
-"grupos de charla."
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Carácter para propor para engadir logo do alcume desexado cando alguén está a "
-"empregalo no grupo de conversa."
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Engadir * e [n] no título da listaxe?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Cantas liñas quere lembrar da última charla cando se volve abrir "
-"un separador/fiestra de charla"
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Cantos minutos debe durar a última liña da conversa anterior."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como "
-"o cliente de Mirabilis ICQ)"
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
-"significa usar o wiktionary"
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
-
-#: ../src/common/config.py:154
-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 ""
-"Se é verdadeiro, escoite os sinais D-Bus de NetworkManager e os cambios do "
-"estado das contas (con tal de que non teñan o listen_to_network_manager "
-"posto en Falso e sincronicen co estado global) baseados no estado da"
-"conexión da rede."
-
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Enviáronse as notificacións de estado. Pode ser all, composing_only o disabled."
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"As notificacións de estado móstranse nas fiestras de conversa. "
-"Poden ser todo, só_compor ou desactivado."
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
-"cada x minutos."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
-"nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Non preguntar nunca antes de pechar a fiestra/separador dun grupo de "
-"charla nesta listaxe (separada por espazos) de ID de Jabber de grupos "
-"de charla."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Elimínase o host que enviamos para a transferencia dun ficheiro caso "
-"de tradución do enderezo ou o redirección de portos."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Notifica acontecementos na área de notificación."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Quere amosar o separador cando só hai unha conversa?"
-
-#: ../src/common/config.py:175
-#, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Quere amosar o botón de pechar no tabulador?"
-
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
-"de charla."
-
-#: ../src/common/config.py:190
-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 ""
-"Se é verdadeiro, peche o Gajim cando se preme o botón X do xestor de fiestras."
-" Esta preferencia só se activa se se usa a icona da área de "
-"notificación. "
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña mensaxes "
-"sen ler. A depender do tema, esta icona pode ser animada."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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 ""
-"Se é verdadeiro, o Gajim pediralle unha circunstancia a cada contacto que non tivo unha circunstancia a última vez ou se ten gardada unha demasiada antiga."
-
-#: ../src/common/config.py:196
-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 ""
-"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:197
-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 ""
-"pode ser \"none\", \"all\" ou \"in_and_out\". Se é \"none\", Gajim non "
-"volverá mostrar a liña de estado nos grupos de conversa cando un "
-"membro cambie a súa mensaxe de estado. Se é \"all\" o Gajim amosará todos as "
-"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:199
-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:200
-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:202
-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:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Non amosar a circunstancia para o transporte en si mesmo"
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Non amosar a listaxe na barra de tarefas."
-
-#: ../src/common/config.py:205
-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 ""
-"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:207
-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 ""
-"A Jabberd1.4 non lle gusta a información SHA cando se entra nun grupo de "
-"charla protexido por contrasinal. Cambie esta opción a Falso para "
-"deter o envío de información SHA no grupo de charla."
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Controla a fiestra onde se colocan as novas mensaxes.\n"
-"'sempre' - Todas as mensaxes son enviadas a unha fiestra única.\n"
-"'nunca' - Todas as mensaxes obteñen a súa propia fiestra.\n"
-"'porconta' - As mensaxes para cada conta envíanse a unha fiestra específica.\n"
-"'portipo' - Cada tipo de mensaxe (por exemplo, charlas vs. grupos de "
-"charla) 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:211
-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:212
-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:213
-msgid "Hides the buttons in group chat window."
-msgstr "Oculta os botóns nas fiestras de grupo de charla."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Oculta os botóns nas fiestras de charla de dúas persoas."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Oculta o báner nunha fiestra de grupo de charla"
-
-#: ../src/common/config.py:216
-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:217
-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:218
-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 ""
-"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:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
-"charla."
-
-#: ../src/common/config.py:221
-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:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-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:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
 msgstr ""
-"Se é verdadeiro, poderá definir unha prioridade negativa á súa conta na "
-"fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
-"prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
+"Está a agardar a resposta do contacto sobre a súa solicitude de subscrición"
 
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
-"están definidas nas opcións de autoprioridade_*"
-
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr "Corrección Jabberd2"
-
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-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:326
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Está o OpenPGP activado para este contacto?"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-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:336
-msgid "all or space separated status"
-msgstr "estado separado por espazos ou all"
-
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr "'si', 'non' ou 'ambos'"
-
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr "'si', 'non' ou ''"
-
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "A durmir"
-
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "Volvo axiña"
 
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "Volvo nuns minutos."
-
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "A comer"
-
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "Estou a comer, déixeme unha mensaxe."
-
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "Filme"
-
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "Estou a ver un filme."
-
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "A traballar"
-
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "Estou a traballar."
-
-
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "Teléfono"
-
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "Estou a falar por teléfono."
-
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "Fóra"
-
-#: ../src/common/config.py:357
-msgid "I'm out enjoying life."
-msgstr "Estou fóra a gozar da vida."
-
-#: ../src/common/config.py:361
-msgid "I'm available."
-msgstr "Estou dispoñíbel."
-
-#: ../src/common/config.py:362
-msgid "I'm free for chat."
-msgstr "Estou libre para falar."
-
-#: ../src/common/config.py:364
-msgid "I'm not available."
-msgstr "Non estou dispoñíbel."
-
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr "Non molestar."
-
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr "Adeus!"
-
-#: ../src/common/config.py:376
-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 ""
-"Son para reproducir cando unha mensaxe de grupo de charla contén unha das "
-"palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
-"contén o teu alcume."
-
-#: ../src/common/config.py:377
-msgid "Sound to play when any MUC message arrives."
-msgstr "Son para reproducir cando chega calquera mensaxe MUC"
-
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "verde"
-
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr "ultramariño"
-
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "humano"
-
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "mariño"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Non se pode cargar o módulo inactivo"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Host errado"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"O host que configurou como a opción avanzada ft_override_host_to_send non "
-"é valido e ignorarase."
-
-#: ../src/common/connection_handlers.py:590
-#, 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:1523
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alcume non permitido: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
-msgid "Unable to join group chat"
-msgstr "Non se puido entrar no grupo de charla"
-
-#: ../src/common/connection_handlers.py:1586
-msgid "A password is required to join this group chat."
-msgstr "É necesario un contrasinal para entrar a este grupo de charla."
-
-#: ../src/common/connection_handlers.py:1589
-msgid "You are banned from this group chat."
-msgstr "Está expulsado deste grupo de charla."
-
-#: ../src/common/connection_handlers.py:1592
-msgid "Such group chat does not exist."
-msgstr "Non existe o grupo de charla."
-
-#: ../src/common/connection_handlers.py:1595
-msgid "Group chat creation is restricted."
-msgstr "A creación de grupos de charla está restrinxida."
-
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "É necesario usar o alcume rexistrado."
-
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "Non está na listaxe de membros"
-
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"O seu alcume da súa preferencia está en uso ou rexistrado por outro ocupante. \n"
-"Por favor, especifique outro alcume abaixo:"
-
-#: ../src/common/connection_handlers.py:1659
-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:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos agora subscritos a %s"
-
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "solicitude de eliminación de subscrición de %s"
-
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "xa non estamos subscritos a %s"
-
-#: ../src/common/connection_handlers.py:1854
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"A ID de Jabber %s non cumpre a norma RFC. Non se engadirá á súa listaxe de contactos. Use "
-"as ferramentas de xestión de listaxe de contactos roster como http://jru.jabberstudio.org/ para o eliminar"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Perdeuse a conexión da conta \"%s\""
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Reconectar manualmente."
-
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "A resposta non é válida"
-
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Non se pode conectar a \"%s\""
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Conectado ao servidor %s:%s con %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Comprobe a súa conexión ou probe máis tarde"
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Fallou a autenticación con \"%s\""
-
-#: ../src/common/connection.py:468
-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."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Non se facilitou a chave de OpenPGP"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "invisíbel"
-
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "desconectado"
-
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "Estou %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
-
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Asunto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr "Non se conseguiu debido ao estado invisíbel"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "falta a dependencia pysqlite2 (tcc python-pysqlite2). A saír..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"O servizo non está dispoñíbel: o Gajim non se está a executar, ou remote_control está en "
-"Falso"
-
-#: ../src/common/exceptions.py:38
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
-
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"O bus da sesión non está dispoñíbel.\n"
-"Probe a ler http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "unha"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "dúas"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tres"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "catro"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "cinco"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "seis"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "sete"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "oito"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "nove"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "dez"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "once"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "doce"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr "%0 en punto"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr "%0 e cinco"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr "%0 e dez"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr "%0 e cuarto"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr "%0 e vinte"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr "%0 e vinte e cinco"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr "%0 e media"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr "%1 menos vinte e cinco"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr "%1 menos vinte"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr "%1 menos cuarto"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "ten to %1"
-msgstr "%1 menos dez"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr "%1 menos cinco"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr "%1 en punto"
-
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr "Noite"
-
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr "Madrugada"
-
-#: ../src/common/fuzzyclock.py:62
-msgid "Morning"
-msgstr "Mañá"
-
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr "Media mañá"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Noon"
-msgstr "Mediodía"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr "Tarde"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Evening"
-msgstr "Serán"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr "Noite"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr "Comezo da semana"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " recurso con prioridade "
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr "Metade de semana"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Cifrado OpenPGP"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr "Final de semana"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s non difundiu a súa chave de OpenPGP nin vostede lle asignou unha"
 
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr "Fin de semana!"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Non existe este comando: /%s (se quere enviar isto, use o prefixo /say)"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Hai un caracter non válido no nome de usuario."
-
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "É necesario o enderezo do servidor."
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
+#~ "terceira persoa. (por exemplo /%s berra.)"
 
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Carácter non válido no nome do host."
-
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Carácter non válido no recurso."
+#~ msgid "Encryption enabled"
+#~ msgstr "Cifrado activado"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "Encryption disabled"
+#~ msgstr "Cifrado desactivado"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "_Servidor:"
+#~ msgstr "_Host:"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Introduza, mais unha vez, o contrasinal:"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "_Use proxy"
+#~ msgstr "_Usar proxy"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Se isto está marcado, todos os contactos locais que empregaren un cliente "
+#~ "Bonjour compatíbel (como iChat, Trillian ou Gaim) apareceran na listaxe "
+#~ "de contactos. Non precisa estar conectado a un servidor de Jabber para o "
+#~ "seu funcionamento.\n"
+#~ "Isto só está dispoñíbel se o python-avahi está instalado e o avahi-daemon "
+#~ "está en execución."
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Se ten dúas ou máis contas e isto está marcado, o Gajim relacionará todos "
+#~ "os contactos de forma mixta"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "Habilitar m_ensaxaría de ligazón local"
+
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo e Xulieta</small>"
+
+#~ msgid "Old stories"
+#~ msgstr "Historias antigas"
+
+#~ msgid "Soliloquy"
+#~ msgstr "Soliloquio"
+
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Prema aquí para ver as charlas anteriores con este contacto"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "Vista _compacta    Alt+C"
+
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Prema para ver as anteriores conversas nesta sala"
+
+#~ msgid "Build custom query"
+#~ msgstr "Construír unha consulta personalizada"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Construtor de consultas..."
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Invitation Received"
+#~ msgstr "Recibiuse un convite"
+
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Formato da liña</b>"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Personalización da interface</b>"
+
+#~ msgid "A_fter nickname:"
+#~ msgstr "Despois do alcume:"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Tamén coñecido como estilo iChat"
+
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Como exemplo, se ten activado a mensaxe de estado en ausente, o Gajim non "
+#~ "lle preguntará máis por unha mensaxe de estado cando mude o seu estado a "
+#~ "ausente; simplemente aplicará a mensaxe predefinida para ausente"
+
+#~ msgid "B_efore nickname:"
+#~ msgstr "Ant_es do alcume:"
+
+#~ msgid "Chat"
+#~ msgstr "Charla"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Cada 5 _minutos"
+
+#~ msgid "Events"
+#~ msgstr "Eventos"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr ""
+#~ "O Gajim amosará automaticamente novos acontecementos a emerxeren na "
+#~ "fiestra relativa"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "O Gajim notificaralle novos acontecementos a través dunha mensaxe "
+#~ "emerxente no bordo inferior dereito da pantalla"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita "
+#~ "da pantalla cando un contacto se conectar"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "O Gajim só lle amosará a icona do contacto que provocou o novo "
+#~ "acontecemento"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ 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 ""
+#~ "Se isto está marcado, o Gajim lembrará a posición da listaxe e das "
+#~ "fiestras de conversa na pantalla e os seus tamaños para a próxima vez que "
+#~ "aparezan"
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Ocupado"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Nunca\n"
+#~ "Sempre\n"
+#~ "Por conta\n"
+#~ "Por tipo"
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Ocupado"
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Notificacións saíntes do estado de charla:"
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_Non dispoñíbel"
+#~ msgid "Print time:"
+#~ msgstr "Inserir a hora:"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Libre para falar"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Gardar a _posición e o tamaño para as fiestras de charla e a listaxe de "
+#~ "contactos"
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Libre para falar"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr ""
+#~ "Cambiar a mensaxe de estado para reflectir a pista_musical en reprodución"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "En liñ_a"
+#~ msgid "Show only in _roster"
+#~ msgstr "Amosar só na _listaxe de contactos"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "En líña"
+#~ msgid "The auto away status message"
+#~ msgstr "A mensaxe de estado de autoausencia"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Conectando"
+#~ msgid "The auto not available status message"
+#~ msgstr "A mensaxe de estado de non autodispoñíbel"
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "A_usente"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Usar a icona na á_rea de notificación"
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "D_esconectado"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Cando se recibe un novo acontecemento (mensaxe, envío de ficheiros etc.), "
+#~ "poden usarse os seguintes métodos para o informar. Cómpre salientar que "
+#~ "os acontecementos das mensaxes novas só ocorren se proceden dun contacto "
+#~ "con que non estaba xa a conversar"
+
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Funciona para os reprodutores Rythmbox e Muine. Para máis reprodutores, "
+#~ "pode visitar http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Control de notificacións _avanzadas..."
+
+#~ msgid "_After time:"
+#~ msgstr "_Despois da hora:"
+
+#~ msgid "_Before time:"
+#~ msgstr "_Antes da hora:"
+
+#~ msgid "_Font:"
+#~ msgstr "_Letra:"
+
+#~ msgid "_Never"
+#~ msgstr "_Nunca"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "_Notificarmo"
+
+#~ msgid "_Player:"
+#~ msgstr "_Reprodutor:"
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Desconectado"
+#~ msgid "_Pop it up"
+#~ msgstr "_Emerxer"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL"
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "_Invisíbel"
+#~ msgid "Address"
+#~ msgstr "Enderezo"
+
+#~ msgid "City:"
+#~ msgstr "Cidade:"
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "Descoñecido"
+#~ msgid "Company:"
+#~ msgstr "Empresa:"
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "Ten erros"
+#~ msgid "Country:"
+#~ msgstr "País:"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "Ningunha"
+#~ msgid "Given:"
+#~ msgstr "Nome:"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "A"
+#~ msgid "Middle:"
+#~ msgstr "Medio:"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Ambos"
+#~ msgid "Position:"
+#~ msgstr "Posición:"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "Ningunha"
+#~ msgid "Prefix:"
+#~ msgstr "Prefixo"
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "_Engadir"
+#~ msgid "Role:"
+#~ msgstr "Papel:"
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "Ningún"
+#~ msgid "State:"
+#~ msgstr "Estado:"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Moderadores"
+#~ msgid "Suffix:"
+#~ msgstr "Sufixo:"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Moderador"
+#~ msgid "_Retrieve"
+#~ msgstr "_Recuperar"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Participantes"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Eliminar da listaxe"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Participante"
+#~ msgid "A_ccounts"
+#~ msgstr "_Contas"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Visitantes"
+#~ msgid "_Filter:"
+#~ msgstr "_Filtro:"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Visitante"
+#~ msgid "Ask:"
+#~ msgstr "Pregunta:"
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Ningún"
+#~ msgid "Client:"
+#~ msgstr "Cliente:"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Propietario"
+#~ msgid "OS:"
+#~ msgstr "SO:"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Administrador"
+#~ msgid "Subscription:"
+#~ msgstr "Subscrición:"
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Membro"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Se esta non é a súa lingua para a quere marcar os erros ortográficos, "
+#~ "debe definir a variábel $LANG co valor apropiado. Por exemplo, para o "
+#~ "Francés debe exportar LANG=fr_FR ou exportar LANG=fr_FR.UTF-8 en ~/."
+#~ "bash_profile ou facelo globalmente en /etc/profile.\n"
+#~ "\n"
+#~ "A marcación de erros ortográficos non se empregará"
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "está a prestar atención á conversa"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Cada %s _minutos"
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "está a facer algo máis"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Debe introducir un contrasinal para a conta nova"
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "está a escribir..."
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Sempre o verá desconectado."
 
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "Parou de escribir"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s está agora %s (%s)"
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "pechou a fiestra de charla"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "De: %(from_address)s"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d mensaxe sen ler"
-msgstr[1] "%d mensaxes sen ler"
+#~ msgid "Network Manager support not available"
+#~ msgstr "O soporte para o xestor de rede non está dispoñíbel"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d mensaxe único sen ler"
-msgstr[1] "%d mensaxes únicas sen ler"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "O soporte de manexo de sesión non está dispoñíbel (falta o módulo gnome."
+#~ "ui)"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d mensaxe de grupo de charla sen ler"
-msgstr[1] "%d mensaxes de grupo de charla sen ler"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Modo de uso: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d mensaxe privada sen ler"
-msgstr[1] "%d mensaxes privadas sen ler"
+#~ msgid "Private Chat"
+#~ msgstr "Charla privada"
 
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "Group Chat"
+#~ msgstr "Grupos de charla"
 
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: non se pode abrir %s para lectura"
+#~ msgid "%s is now %s"
+#~ msgstr "%s está agora %s"
 
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s non semella ser un JID válido"
 
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr "ciano"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/optparser.py:302
-msgid "migrating logs database to indeces"
-msgstr "migrando os rexistros da base de datos aos índices"
+#~ msgid "Information published"
+#~ msgstr "Información publicada"
 
-#: ../src/common/passwords.py:86
-#, python-format
-msgid "Gajim account %s"
-msgstr "Conta de Gajim %s"
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr "Sen unha conexión non pode obter a súa información de contacto."
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Non foi posíbel estabelecer a conexión ao host: resposta incorrecta do servidor."
+#~ msgid "_New group chat"
+#~ msgstr "_Grupo de charla novo"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Non foi posíbel estabelecer a conexión ao host"
+#~ msgid "_Log on"
+#~ msgstr "_Conectar"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Non foi posíbel estabelecer a conexión ao host: expirou cando enviaba a información."
+#~ msgid "Log _off"
+#~ msgstr "_Desconectar"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
+#~ msgid "Save passphrase"
+#~ msgstr "Gardar o contrasinal"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Para continuar a enviar e recibir mensaxes, precisa volver conectarse."
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Deixar %s no grupo %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Erro de Avahi"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Facer %s e %s metacontactos"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"A mensaxaría de ligazón local podería non funcionar correctamente."
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Oculta os botóns nas fiestras de charla de dúas persoas."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Por favor, comprobe se o Avahi está instalado."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Conectado ao servidor %s:%s con %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Non foi posíbel iniciar o servizo local"
+#~ msgid "invisible"
+#~ msgstr "invisíbel"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Non foi posíbel ligar ao porto %d."
+#~ msgid "offline"
+#~ msgstr "desconectado"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Por favor, comprobe se o avahi-daemon está en execución."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d mensaxe único sen ler"
+#~ msgstr[1] "%d mensaxes únicas sen ler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d mensaxe de grupo de charla sen ler"
+#~ msgstr[1] "%d mensaxes de grupo de charla sen ler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido enviar "
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d mensaxe privada sen ler"
+#~ msgstr[1] "%d mensaxes privadas sen ler"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Esta mensaxe está cifrada]"
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Erro ao engadir o servizo. %s"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Non foi posíbel estabelecer a conexión ao host: resposta incorrecta do "
+#~ "servidor."
 
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Non foi posíbel estabelecer a conexión ao host"
diff --git a/po/hr.po b/po/hr.po
index 0419ce584..eee780646 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,16 +6,11 @@
 # Armando V. <synan@rilinux.hr> 2006.
 # Vedran M. <rivanvx@gmail.com> 2006.
 #
-#: ../src/chat_control.py:1224 ../src/gajim-remote.py:203
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:236
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:243
-#: ../src/gajim-remote.py:244 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:246
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-29 21:17+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-05-26 22:10+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -37,37 +32,45 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM Klijent"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Pošalji Jednu _Poruku..."
+#: ../data/glade/roster_window.glade.h:7
+#, fuzzy
+msgid "Join _Group Chat..."
+msgstr "Pridruživanje _Grupnom Razgovoru"
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
 msgstr "_Dodavanje Kontakta..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Otkrivanje Usluga..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupni Razgovor"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Izmjeni Račun"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Izmjeni Račun..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Otvori Dolaznu Poštu Gmail-a"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Osobne Informacije"
+
 #: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
+#, fuzzy
+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"
@@ -88,7 +91,8 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, fuzzy
+msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Molimo popunite podatke za vaš novi korisnički račun</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
@@ -96,61 +100,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti od jabber "
 "servera"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Spoji se kada pritisnem Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Čarobnjak za Stvaranje Računa"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+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:11
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Želim se _registrirati novi račun"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj račun"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Podesi..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Snimi lo_zinku"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Mogućnosti Poslužitelja"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri spajanju"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Koristi vlastito ime poslužitelja/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -158,59 +173,64 @@ msgstr ""
 "Morate imati račun kako bi se mogli spojiti\n"
 "na Jabber mrežu."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Vaš JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Ime poslužitelja:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:31
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Ostalo</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobne informacije</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Korisnički račun"
 
@@ -219,19 +239,23 @@ msgid "Account Modification"
 msgstr "Modifikacija Korisničkog Računa"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Administration operations"
 msgstr "Administratorski postupci"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatsko ponovno spajanje kada je veza izgubljena"
 
 #: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
 #: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "P_romijeni Lozinku"
 
@@ -248,47 +272,60 @@ msgstr ""
 "biti onemogućen"
 
 #: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Odaberi _Ključ"
 
 #: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Kliknite za promjenu lozinke korisničkog računa"
 
 #: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Kliknite da zatražite autorizaciju svih kontakata drugog računa"
 
 #: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Veza"
 
 #: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Izmjeni Osobne Informacije"
 
+#. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:460
-#: ../src/notify.py:482 ../src/notify.py:494 ../src/common/helpers.py:918
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 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/preferences_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:349 ../src/roster_window.py:604
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1677
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2495
-#: ../src/roster_window.py:2532 ../src/common/contacts.py:292
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Općenito"
 
 #: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Ime poslužitelja:"
 
 #: ../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."
@@ -297,6 +334,7 @@ msgstr ""
 "prijenosi datoteka imali veću šansu uspjeha."
 
 #: ../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"
@@ -314,6 +352,7 @@ msgstr ""
 "dozvolom samo za vas"
 
 #: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -323,6 +362,7 @@ msgstr ""
 "koristeći ovaj račun"
 
 #: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -333,43 +373,48 @@ msgstr ""
 "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
 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/zeroconf_properties_window.glade.h:16 ../src/config.py:1623
-#: ../src/config.py:3413
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
 #. None means no proxy profile selected
-#. GPG Key
 #: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1196
-#: ../src/config.py:1201 ../src/config.py:1385 ../src/config.py:1613
-#: ../src/config.py:1622 ../src/config.py:1682 ../src/config.py:1756
-#: ../src/config.py:2958 ../src/config.py:3003 ../src/config.py:3403
-#: ../src/config.py:3412 ../src/dialogs.py:282 ../src/dialogs.py:284
-#: ../src/roster_window.py:1781 ../src/roster_window.py:1788
-#: ../src/roster_window.py:1795
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ništa"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Osobne Informacije"
 
 #: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
 #: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
 #: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -380,6 +425,7 @@ msgstr ""
 "klijent sa najvišim prioritetom dobiva te događaje"
 
 #: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promijenjen prema vašem statusu."
 
@@ -388,10 +434,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Resur_s:"
 
 #: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -410,20 +458,26 @@ msgid "Save _passphrase (insecure)"
 msgstr "Snimi _lozinku (nesigurno)"
 
 #: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Snimi _dnevnik razgovora za sve kontakte"
 
 #: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Šalji keep-alive pakete"
 
 #: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_roniziraj status računa sa globalnim statusom"
 
 #: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Sinkroniziraj kontakte"
 
@@ -432,14 +486,17 @@ msgid "Use _SSL (legacy)"
 msgstr "Koristi _SSL (zastarjelo)"
 
 #: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Koristi proxy za prijenos datoteka"
 
 #: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Podesi prema statusu"
 
 #: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
@@ -447,49 +504,105 @@ msgstr "_Jabber ID:"
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Karakteristike</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Korisnički Račun"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Ako je označeno, svi lokalni kontakti koji koriste Bonjour kompatibilni "
-"klijent za razgovor (kao iChat, Trillian ili Gaim) biti će prikazani na "
-"listi kontakata. Ne morate biti spojeni na jabber poslužitelj kako bi ovo "
-"radilo.\n"
-"Ovo je dostupno samo ako je instaliran python-avahi i avahi-daemon je "
-"pokrenut."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Omogući"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Ime:"
+
+#: ../data/glade/accounts_window.glade.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj račun"
+
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 imate 2 ili više računa i ovo je označeno, Gajim će prikazivati sve "
-"kontakte kao da imate jedan račun"
+"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:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Prezime:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Spoji račune"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Omogući poruke preko lokalne veze"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Pre_imenuj"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Izmjeni"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Ukloni"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Koristi vlastiti port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -584,6 +697,7 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
@@ -610,49 +724,45 @@ msgid "Deletes Message of the Day"
 msgstr "Briše Poruku Dana"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Liste _Privatnosti"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 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:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Postavi MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Postavlja Poruku Dana (Message of the Day)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Prikaži _XML Konzolu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Osvježi MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Osvježava Poruku Dana"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Blocked Contacts"
-msgstr "_Blokirani Kontakti"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Privacy Lists"
-msgstr "Liste _Privatnosti"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Pošalji Poslužiteljsku Poruku"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:13
-msgid "_Send Single Message"
-msgstr "_Pošalji Jednu Poruku"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " otvaranje prozora/taba sa tim kontaktom "
@@ -666,7 +776,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Uvjeti</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Zvukovi</b>"
 
@@ -683,7 +793,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Odsutan"
 
@@ -700,7 +810,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -709,7 +819,7 @@ msgid "Launch a command"
 msgstr "Pokrenite naredbu"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -834,6 +944,33 @@ msgstr "Primljen novi unos"
 msgid "You have received new entry:"
 msgstr "Primili ste novi unos:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "Blokirani Kontakti"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Predefinirane Statusne Poruke</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Predefinirane Statusne Poruke</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Zvukovi</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Promijeni Password"
@@ -863,10 +1000,9 @@ msgid "Join _Group Chat"
 msgstr "Pridruživanje _Grupnom Razgovoru"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Dodaj na Listu"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -886,39 +1022,70 @@ msgid "_Open Link in Browser"
 msgstr "_Otvori Link u Pretražniku"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../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/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Pritisnite za pregled prošlih razgovora sa ovim kontaktom"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontakti"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Pošalji _Datoteku"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/Isključi Open_PGP Enkripciju"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uključi/Isključi Open_PGP Enkripciju"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kompaktan Pregled    Alt+K"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Dodaj na Listu"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:8
-#: ../data/glade/gc_occupants_menu.glade.h:6
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Povijest"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Pozo_vi u"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Posmatrači"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Ispunite formular."
@@ -931,6 +1098,24 @@ msgstr "Konfiguracija Sobe"
 msgid "Edit Groups"
 msgstr "Izmjeni Grupe"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Opis</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Mogućnosti Poslužitelja"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
@@ -984,7 +1169,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Pokaži popup obavijest kada se završi prijenos datoteka"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Nastaviti"
 
@@ -992,7 +1177,7 @@ msgstr "_Nastaviti"
 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:188
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Otvaranje Mape Sadržaja"
 
@@ -1040,7 +1225,7 @@ msgstr "Personalizacija Gajim Tema"
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Neaktivno"
 
@@ -1081,67 +1266,74 @@ msgid "_Background:"
 msgstr "_Pozadina:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Promijeni _Nadimak"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Promijeni _Temu"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Pritisnite za pregled proteklog razgovora u ovoj sobi"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Podešavanje _Sobe"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Podešavanje _Sobe"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Postavi Knjižnu Oznaku"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Postavi Knjižnu Oznaku"
+#, fuzzy
+msgid "_Destroy Room"
+msgstr "_Uništi sobu"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Destroy room"
-msgstr "_Uništi sobu"
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Podešavanje Knjižnih Oznaka"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:9
-msgid "_Minimize"
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+#, fuzzy
+msgid "_Minimize on close"
 msgstr "_Minimiziraj"
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
-#, fuzzy
-msgid "A_dministrator"
-msgstr "Administrator"
-
-#: ../data/glade/gc_occupants_menu.glade.h:2
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Akcije Prisutnih"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Član"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Vlasnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Pošalji Privatnu Poruku"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Glas"
 
@@ -1149,22 +1341,19 @@ msgstr "_Glas"
 msgid "Create new post"
 msgstr "Stvorite novi dopis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Tema"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1179,61 +1368,58 @@ msgstr ""
 "Općenito izbjegavajte uklanjanja vezana uz kontakte sa kojima trenutno "
 "razgovarate."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim Upravitelj Zabilješkama Povijesti"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Izvoz"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Upravitelj Zabilješkama Povijesti"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Pretraži Bazu Podataka"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Izgradi prilagođeno pretraživanje"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Povijest razgovora"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Graditelj Upita..."
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
+#: ../data/glade/history_window.glade.h:5
+#, fuzzy
+msgid "Search:"
 msgstr "Pretraga"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:6
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
-#: ../data/glade/history_window.glade.h:6 ../src/disco.py:1177
-msgid "_Search"
-msgstr "_Pretraga"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Prihvati"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Odbij"
-
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Primljen Poziv"
-
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1243
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
@@ -1242,14 +1428,12 @@ 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:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Nadimak:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Lozinka:"
 
@@ -1258,12 +1442,12 @@ msgid "Recently:"
 msgstr "Nedavno:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1165
-#: ../src/disco.py:1615
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Pridruživanje"
 
@@ -1284,18 +1468,37 @@ msgstr ""
 msgid "Manage Bookmarks"
 msgstr "Podešavanje Knjižnih Oznaka"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Naslov:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Konfiguracija Sobe"
+
+#: ../data/glade/manage_pep_services_window.glade.h:2
+#, fuzzy
+msgid "_Configure"
+msgstr "_Nastaviti"
+
+#: ../data/glade/manage_pep_services_window.glade.h:3
+#, fuzzy
+msgid "gtk-delete"
+msgstr "Obriši"
+
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Karakteristike</b>"
@@ -1317,8 +1520,6 @@ msgid "Manage Proxy Profiles"
 msgstr "Podešavanje Proxy Profila"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1339,24 +1540,54 @@ msgid "_Host:"
 msgstr "_Poslužitelj:"
 
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Kliknite da ubacite emoticon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaje kontakt na listu"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1167
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Enkripcija"
+#: ../data/glade/message_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Postavi Knjižnu Oznaku"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Akcije"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Promijeni _Nadimak"
 
-#. 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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "obraća pažnju na razgovor"
+
+#: ../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 "Kliknite da ubacite emoticon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:245
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Pošalji"
 
@@ -1372,36 +1603,77 @@ msgstr "<b>Napredni Uređivač Konfiguracije</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacije</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Akcije</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Osobni</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Izmjena pravila</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Format linije</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Boje Tabova Statusa Razgovora</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Mogućnosti</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Vizualne Obavijesti</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Prilagođavanje Sučelja</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Osobni</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Zvukovi</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Mogućnosti</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Predefinirane Statusne Poruke</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Lista Privatnosti</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Predefinirane Statusne Poruke</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Karakteristike</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualne Obavijesti</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Napredno"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1411,50 +1683,25 @@ msgstr ""
 "Samo pisanje\n"
 "Onemogućeno"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Dozvoli slanje podataka o _OS-u"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Dozvoli popup obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Poznato i kao iChat stil"
-
-#: ../data/glade/preferences_window.glade.h:19
-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"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Primjer: Ako ste omogućili statusnu poruku za odsutnost, Gajim vas neće više "
-"pitati za statusnu poruku kada promjenite svoj status u odsutnost; koristiti "
-"će onu postavljenu ovdje"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Traži poruku statusa kada ja:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Automatski _odsutan nakon:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Automatski _nedostupan nakon:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Automatski prepoznaj na svakom pokretanju Gajima\n"
@@ -1463,71 +1710,57 @@ msgstr ""
 "Uvijek koristi predefinirane XFCE4 aplikacije\n"
 "Prilagođeno"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "Chat"
-msgstr "Razgovor"
-
-#: ../data/glade/preferences_window.glade.h:30
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
-msgstr ""
-"Označite ovu opciju samo ako vam netko van vaše liste šalje neželjene poruke "
-"ili vas uznemirava. Koristite sa oprezom, blokira sve poruke koje dolaze od "
-"ljudi van vaše liste kontakata"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid "Configure color and font of the interface"
-msgstr "Postavi boje i font sučelja"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Predefinirana Statusna Poruka"
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Statusna poruka:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Predefinirani statusni set _ikona"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Uvijek provjeri ako je Gajim _zadani Jabber klijent, pri pokretanju"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Postavi boje i font sučelja"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Utvrđeno po pošiljaocu\n"
-"Razgovorna poruka\n"
-"Jedna poruka"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Prikaži dodatne email _detalje"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Prikaži a_vatare kontakata na listi"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Prikaži statusne _poruke kontakata na listi"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Prikazane Noti_fikacije o statusu razgovora"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Prikaži a_vatare kontakata na listi"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "S_vakih 5 minuta"
+msgid "Display _extra email details"
+msgstr "Prikaži dodatne email _detalje"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Emotikone:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Prikaži a_vatare kontakata na listi"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Događaji"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Prikaži a_vatare kontakata na listi"
 
 #: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Prikaži a_vatare kontakata na listi"
+
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Display status _messages of contacts in roster"
+msgstr "Prikaži statusne _poruke kontakata na listi"
+
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1537,7 +1770,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1547,40 +1780,26 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
 "drugoj osobi."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr "Gajim će automatski prikazivati nove događaje prikazujući bitan prozor"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim će vas obavijestiti o novim događajima sa popup prozorom u donjem "
-"desnom kutu ekrana"
-
 #: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim će vas obavijestiti o kontaktima koji su se upravo prijavili sa popup "
-"prozorom u donjem desnom kutu ekrana"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 "Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa popup "
 "prozorom u donjem desnom kutu ekrana"
 
 #: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Skriva dugmad u prozoru grupnog razgovora."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
 msgstr ""
-"Gajim će mjenjati ikonu samo onom kontaktu koji je potaknuo novi događaj"
+"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
@@ -1592,13 +1811,24 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:53
 msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
+msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1606,244 +1836,297 @@ 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:55
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Ako je označeno, Gajim će se prisjetiti pozicije prozora liste kontakata i "
-"razgovora, kao i njihove veličine kod sljedećeg pokretanja"
+"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
-"(npr. kontakt sa MSN-a će imati msn ikone za statuse)"
+"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
-"ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
+"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignoriraj bogati sadržaj u dolaznim porukama"
+#: ../data/glade/preferences_window.glade.h:60
+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:59
-msgid "Ma_nage..."
-msgstr "Po_desi"
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Označite ovu opciju samo ako vam netko van vaše liste šalje neželjene poruke "
+"ili vas uznemirava. Koristite sa oprezom, blokira sve poruke koje dolaze od "
+"ljudi van vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Nikad\n"
-"Uvijek\n"
-"Ovisi o računu\n"
-"Ovisi o tipu"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju "
+"novih emailova"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Obavijesti me o kontaktima koji:"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
+"(npr. kontakt sa MSN-a će imati msn ikone za statuse)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Obavijesti o novoj _Gmail e-pošti"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "Na svaku _poruku"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
+"ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Prozor _jedne poruke:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Noti_fikacije o statusu odlaznog razgovora"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Prozor _jedne poruke:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Sviraj _zvukove"
+msgid "Ma_nage..."
+msgstr "Po_desi"
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Postavke"
+#, fuzzy
+msgid "Notifications"
+msgstr "Modifikacija Korisničkog Računa"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Prikaz vremena:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Obavijesti me o kontaktima koji:"
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Snimi _poziciju i veličinu za prozore liste kontakata i razgovora"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Obavijesti me o kontaktima koji:"
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Postavi statusnu poruku da odražava trenutno svirajuću _glazbenu traku"
+msgid "Notify on new _GMail email"
+msgstr "Obavijesti o novoj _Gmail e-pošti"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Prikaži samo u _listi kontakata"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Osobne Informacije"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "Se _prijavi"
+msgid "Play _sounds"
+msgstr "Sviraj _zvukove"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "_Se odjavi"
-
-#: ../data/glade/preferences_window.glade.h:77
 msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
 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:78
-msgid "Status"
-msgstr "Status"
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "_Tema:"
+msgid "Preferences"
+msgstr "Postavke"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Statusna poruka automatske odsutnosti"
+msgid "Sign _in"
+msgstr "Se _prijavi"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Statusna poruka automatske ne dostupnosti"
+msgid "Sign _out"
+msgstr "_Se odjavi"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Tretiraj sve dolazne poruke kao:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
+"označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Koristi set ikona _transporta"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sortiranje kontakata po statusu"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Koristi pret_postavljeno od sustava"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Status"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Koristi t_ray ikonu"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Predefinirani statusni set _ikona"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Kada se primi novi događaj (poruka, zahtjev za prijenosom datoteka i sl.), "
-"mogu se koristiti sjedeće metode za obavijest. Imajte na umu da se "
-"obavijesti o novim porukama prikazuju samo za kontakte sa kojima trenutno ne "
-"razgovarate"
+#, fuzzy
+msgid "Style"
+msgstr "Zaustavljeno"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Kada se primi novi događaj"
+msgid "T_heme:"
+msgstr "_Tema:"
 
 #: ../data/glade/preferences_window.glade.h:88
 msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
-"Radi sa Rhytmbox i Muine sviračima. Za više svirača, molimo posjetite http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Napredno Upravljanje Obavijestima..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Pretražnik:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Koristi set ikona _transporta"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Upravitelj datotekama:"
+msgid "Use system _default"
+msgstr "Koristi pret_postavljeno od sustava"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Font:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kada se primi novi događaj"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Osvijetli krivo napisane riječi"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Automatski _odsutan nakon:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
+msgid "_Browser:"
+msgstr "_Pretražnik:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "_Dolazna poruka:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Prikazane Noti_fikacije o statusu razgovora"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "_Pamti promjene statusa kontakata"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emotikone:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Mail klijent:"
+msgid "_File manager:"
+msgstr "_Upravitelj datotekama:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Nikada"
+msgid "_Highlight misspelled words"
+msgstr "_Osvijetli krivo napisane riječi"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Obavijesti me o tome"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Otvori..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignoriraj bogati sadržaj u dolaznim porukama"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "_Odlazna poruka:"
+msgid "_Incoming message:"
+msgstr "_Dolazna poruka:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Player:"
+msgid "_Log status changes of contacts"
+msgstr "_Pamti promjene statusa kontakata"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Iskoči ga"
+msgid "_Mail client:"
+msgstr "_Mail klijent:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "_Ponovo učitavanje Pretpostavljenih Boja"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Automatski _nedostupan nakon:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Sortiranje kontakata po statusu"
+msgid "_Open..."
+msgstr "_Otvori..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "_Statusna poruka:"
+msgid "_Outgoing message:"
+msgstr "_Odlazna poruka:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_URL:"
+msgid "_Reset to Default Colors"
+msgstr "_Ponovo učitavanje Pretpostavljenih Boja"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Prikazane Noti_fikacije o statusu razgovora"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "_Statusna poruka:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Pridruživanje _Grupnom Razgovoru"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Nije na Listi Kontakata"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minuta"
 
@@ -1879,6 +2162,10 @@ msgstr "Svi"
 msgid "Allow"
 msgstr "Dozvoli"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Odbij"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1887,7 +2174,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2085
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
@@ -1927,145 +2214,177 @@ msgstr "da mi prikaže status"
 msgid "to view my status"
 msgstr "da vidi moj status"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Dodaj pravilo</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "O"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresa:"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Rođendan:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Osobni</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Rođendan:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Osobni</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Mjesto:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Zvukovi</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Kliknite za postavljanje avatara"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Odjel:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
-msgid "Company:"
-msgstr "Poduzeće:"
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "E-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Country:"
-msgstr "Država:"
-
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Department:"
-msgstr "Odjel:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Dodatna Adresa:"
 
+#. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-Mail:"
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Obitelj:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Extra Address:"
-msgstr "Dodatna Adresa:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Osobni</b>"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Family:"
-msgstr "Obitelj:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: GGGG-MM-DD"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Vlastita stranica:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Dodaj pravilo</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:24
-msgid "Given:"
-msgstr "Dano:"
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Osobni</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Homepage:"
-msgstr "Vlastita stranica:"
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Nadimak:"
+
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Broj Telefona:"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:28
-msgid "Middle:"
-msgstr "Srednje"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Uvjeti</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "More"
-msgstr "Više"
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Poštanski broj:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Karakteristike</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Personal Info"
-msgstr "Osobne Informacije"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Zvukovi</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:35
-msgid "Phone No.:"
-msgstr "Broj Telefona:"
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Postavke</b>"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Position:"
-msgstr "Pozicija:"
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Postavke</b>"
 
+#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Postal Code:"
-msgstr "Poštanski broj:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Zvukovi</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
 #: ../data/glade/vcard_information_window.glade.h:39
-msgid "Prefix:"
-msgstr "Prefiks:"
+msgid "About"
+msgstr "O"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:382
-msgid "Role:"
-msgstr "Uloga:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:42
-msgid "State:"
-msgstr "Država:"
+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:44
-msgid "Street:"
-msgstr "Ulica:"
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: GGGG-MM-DD"
 
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:48
-msgid "Suffix:"
-msgstr "Sufiks:"
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Osobne Informacije"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Posao"
 
@@ -2081,101 +2400,128 @@ msgstr "Ukloni račun sam_o iz Gajima"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Ukloni"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Traži njegov/njezin status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Dodaj Posebnu _Obavijest"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Custom _Avatar"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Pridruži Open_PGP Ključ"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2357
-msgid "Edit _Groups"
+#: ../data/glade/roster_contact_context_menu.glade.h:4
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Izmjeni _Grupe"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2593
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Izvršiti Naredbu..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2315
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Ukloni"
+
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Pošalji Jednu _Poruku"
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+msgid "Send Cus_tom Status"
+msgstr "Šalje Prila_gođeni Status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Pošalji Jednu _Poruku..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send cus_tom status"
-msgstr "Pošalji prilagođeni status"
+#, fuzzy
+msgid "Send _File..."
+msgstr "Pošalji _Datoteku"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Set Custom _Avatar..."
+msgstr "Šalje Prila_gođeni Status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Započni _Razgovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli njemu/njoj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2381 ../src/roster_window.py:2540
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#, fuzzy
-msgid "_Manage contact"
-msgstr "Podešavanje Računa"
-
-#. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:18
-#: ../src/roster_window.py:2309 ../src/roster_window.py:2466
-#: ../src/roster_window.py:2614
-msgid "_Remove from Roster"
-msgstr "_Ukloni sa Liste kontakata"
+msgid "_Ignore"
+msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2602
-msgid "_Rename"
-msgstr "_Preimenuj"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Podešavanje Računa"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Preimenuj"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Pretplata"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-#: ../src/roster_window.py:2375 ../src/roster_window.py:2534
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "devet"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "Korisnički računi"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Dodavanje Kontakta..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Dodaj _Kontakt"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Mogućnosti Poslužitelja"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2189,51 +2535,91 @@ msgstr "Često Postavljana Pitanja (online)"
 msgid "Help online"
 msgstr "Online Pomoć"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Prikaži _Prijenose"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Prikaži _Listu Kontakata"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Sadržaj"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Korisnički Račun"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Otkrivanje Usluga"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Akcije"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1353
-#: ../src/roster_window.py:2585
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Sadržaj"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Pošalji Jednu _Poruku..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Pogled"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Pričekajte dok se odvija primanje liste naredbi..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Pretraga"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Dodaj _Kontakt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Informacije Kontakta"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Pretraga"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "K_reni"
@@ -2242,10 +2628,6 @@ msgstr "K_reni"
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registriraj na"
@@ -2320,10 +2702,32 @@ msgstr "Zahtjev za Pretplatom"
 msgid "_Deny"
 msgstr "_Odbij"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID kontakta sa kojim želite razgovarati"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise : select contacts"
+msgstr "Sinkroniziraj kontakte"
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Prikaži Sve _Događaje na Čekanju"
@@ -2336,62 +2740,69 @@ msgstr "Prikaži _Listu Kontakata"
 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:5
-msgid "Ask:"
-msgstr "Pitaj:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Akcije</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Click to force avatar"
-msgstr "Kliknite za prisilno postavljanje avatara"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Osobni</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
-msgid "Client:"
-msgstr "Klijent:"
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Resurs"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Postavke</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Opis</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Osobni</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Komentari"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Configured avatar:"
 msgstr "Podešeni avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Informacije Kontakta"
 
-#: ../data/glade/vcard_information_window.glade.h:26
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:442
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Resurs"
-
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
 #: ../data/glade/vcard_information_window.glade.h:46
-msgid "Subscription:"
-msgstr "Pretplata:"
+msgid "More"
+msgstr "Više"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "User avatar:"
 msgstr "Korisnički Avatar:"
 
@@ -2403,11 +2814,6 @@ msgstr "<b>Jabber Promet</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Unos</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Omogući"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2426,15 +2832,29 @@ msgstr "_Poruka"
 msgid "_Presence"
 msgstr "_Prisutnost"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Ime:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Dodaj Posebnu _Obavijest"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Prezime:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Pridruži Open_PGP Ključ"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Izmjeni _Grupe"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Preimenuj"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Izmjeni Račun..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2444,248 +2864,406 @@ msgstr "Lokalni jid:"
 msgid "Personal"
 msgstr "Osobno"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Resurs"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Izmjeni Račun"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Koristi vlastiti port:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Informacije Kontakta"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktivno"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Neaktivno"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Cijeli broj"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Ime Postavke"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Vrsta"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Nema)"
 
-#. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Skrivena"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Bjeloruski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretonski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Njemački"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Španjolski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Talijanski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilski Portugalski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:244
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
 
 #. we are not connected
-#: ../src/chat_control.py:267 ../src/chat_control.py:473
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:268 ../src/chat_control.py:474
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1092
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Enkripcija omogućena"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Nije na Listi Kontakata"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" od %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1181
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Enkripcija onemogućena"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Koristi autentifikaciju"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Koristi autentifikaciju"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s nije ustupio OpenPGP ključ, niti mu je ikoji dodijeljen"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
+
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
 
-#: ../src/chat_control.py:1215 ../src/groupchat_control.py:1337
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
 
-#: ../src/chat_control.py:1218 ../src/groupchat_control.py:1351
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Način korištenja: /%s, prazni tekstualni prozor"
 
-#: ../src/chat_control.py:1221 ../src/groupchat_control.py:1356
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Način korištenja: /%s, sakriva dugmadi."
 
-#: ../src/chat_control.py:1226 ../src/groupchat_control.py:1395
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Način korištenja: /%s <action>, šalje akciju trenutnom grupnom razgovoru. "
+"Koristite treću osobu. (npr. /%s eksplodira.)"
+
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Način korištenja: /%s, sakriva dugmadi."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Nema informacija ni pomoći za /%s"
 
-#: ../src/chat_control.py:1356
-msgid "Encryption enabled"
-msgstr "Enkripcija omogućena"
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Ova poruka je kriptirana]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
 
-#: ../src/chat_control.py:1361
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Enkripcija onemogućena"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1505 ../src/conversation_textview.py:501
-#: ../src/dialogs.py:655 ../src/gajim.py:862 ../src/gajim.py:863
-#: ../src/gajim.py:1254 ../src/roster_window.py:335
-#: ../src/roster_window.py:417 ../src/roster_window.py:1739
-#: ../src/roster_window.py:1749 ../src/roster_window.py:1928
-#: ../src/roster_window.py:2152 ../src/roster_window.py:2857
-#: ../src/roster_window.py:3064 ../src/roster_window.py:4362
-#: ../src/roster_window.py:4364 ../src/common/contacts.py:76
-#: ../src/common/helpers.py:43 ../src/common/helpers.py:255
-msgid "Not in Roster"
-msgstr "Nije na Listi Kontakata"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Ova poruka je kriptirana]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Ova poruka je kriptirana]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:1650
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2693,29 +3271,2600 @@ msgstr ""
 "Ako zatvorite ovaj tab, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/config.py:139 ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "kreiram bazu zabilješki"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, 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:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim će se sad isključiti"
+
+#: ../src/common/check_paths.py:136
+#, 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:152
+#, python-format
+msgid "creating %s directory"
+msgstr "kreiram %s direktorij"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Izmjeni informacije o statusu"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Promjeni status"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Postavi tip i opis prisustva"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Slobodan za razgovor"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Spojen"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Produženo odsustvo"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Ne uznemiravaj"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Neumreženo - prekid veze"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Opis prisustva:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Status je promjenjen."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Novi Grupni Razgovor"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s u %(room_name)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Niste se  pridružili grupnom razgovoru"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Izaberite grupne razgovore koje želite napustiti"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Grupni Razgovori"
+
+#: ../src/common/commands.py:247
+msgid "You left the following groupchats:"
+msgstr "Napustili ste sljedeći grupni razgovor:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d nepročitana poruka"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Koristi DBus i Obavještajni-Demon za prikazivanje obavijesti"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr ""
+"Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Odsutan, kao posljedica mirovanja"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr ""
+"Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Nije dostupan, kao posljedica mirovanja."
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Predefinirano"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Omogući lokalnu vezu/zeroconf poruke"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Jezik koji koristi pravopis"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'uvijek' - ispisuj vrijeme za svaku poruku.\n"
+"'ponekad' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
+"'nikada' - nikada ne ispisuj vrijeme."
+
+#: ../src/common/config.py:121
+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 ""
+"Ispisuj vrijeme u razgovorima koristeći Nejasni Sat. Vrijednost nejasnoće od "
+"1 do 4 ili 0 za onemogućavanje nejasnog sata. 1 je najprecizniji sat, 4 "
+"najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na "
+"'ponekad'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Koristi * / _ parove kao znakove za formatiranje."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Ako je Istinito, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
+"omeđeno sa * *."
+
+#: ../src/common/config.py:128
+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 ""
+"Koristi ReStructured tekst markup za HTML i ascii formatiranje ako je "
+"odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/"
+"rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka "
+"tab) u grupnom razgovoru"
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
+"razgovoru već koristi željeni nadimak"
+
+#: ../src/common/config.py:161
+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 ""
+"Ova postavka omogućava prilagođavanje vremenske oznake koja se ispisuje u "
+"razgovorima. Na primjer  \"[%H:%M] \" će prikazati \"[hour:minute] \". "
+"Pogledati python dokumentaciju za strftime za kompletan opis: http://docs."
+"python.org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Dodaj * i [n] u naslov liste?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/tab "
+"razgovora ponovno otvori."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
+"(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Ili je osobni url sa %s u njemu gdje je %s riječ ili fraza ili 'WIKTIONARY' "
+"sta znaci da koristi wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
+
+#: ../src/common/config.py:180
+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 ""
+"Ako je Istinito, osluškuj D-Bus signale iz UpraviteljaMrežom i promjeni "
+"status računa (ako nemaju listen_to_network_manager postavljen na Neistinito "
+"i sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
+"samo_sastavljanje, onemogućeno."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Prikazane obavijesti o statusu u prozoru razgovora. Može biti jedno od svi, "
+"samo_sastavljanje, onemogućeno."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
+"ga svakih x minuta"
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Pitaj prije zatvaranja taba/prozora razgovora grupe."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Uvijek pitaj prije zatvaranja taba/prozora grupnog razgovora u ovoj razmakom "
+"odjeljenoj listi jid-ova grupnog razgovora."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nikad ne pitaj prije zatvaranja taba/prozora grupnog razgovora u ovoj "
+"razmacima podjeljenoj listi jid-ova grupnog razgovora."
+
+#: ../src/common/config.py:190
+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 ""
+"Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
+"sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Obavijesti o svim događajima u ikoni trake radne površine."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Prikaži tab ako je otvoren samo jedan razgovor?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Prikaži granicu notesa sa tabovima u prozorima razgovora?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Prikaži gumb za zatvaranje u tabu?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
+"razgovorima."
+
+#: ../src/common/config.py:219
+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 ""
+"Ako je Istinito, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
+"upotrebljena samo ako je \"trayicon\" u upotrebi."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Ako je Istinito, Gajim će provjeriti da li je zadani jabber klijent pri "
+"svakom pokretanju."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Ako je Istinito, Gajim će prikazvati ikonu na svakom tabu koji sadrži "
+"nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Ako je Istinito, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
+"svaki kontakt pod imenom kontakta na listi."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Ako je Istinito, će Gajim poslati upit za avatar svaki kontakt, koji nije "
+"imao avatar ili je onaj u memoriji prestar"
+
+#: ../src/common/config.py:229
+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 ""
+"Ako je Neistinito, više nećete vidjeti statusnu poruku u razgovorima, kada "
+"kontakt promjeni svoj status i/ili statusnu poruku."
+
+#: ../src/common/config.py:230
+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 ""
+"može biti \"ništa\", \"sve\" ili \"ulaz_i_izlaz\". Ako je \"ništa\", Gajim "
+"više neće ispisivati statusnu liniju u grupnim razgovorima kada član "
+"promjeni svoj status i/ili izmjeni statusnu poruku. Ako je \"sve\", Gajim će "
+"prikazivati sve statusne poruke. Ako je \"ulaz_i_izlaz\" Gajim će "
+"prikazivati samo poruke tipa FOO je ušao/izašao u/iz sobe"
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Boja pozadine kontakata kada su se upravo prijavili."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Boja pozadine kontakata kada su se upravo odjavili."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Ako je Istinito, vraćene poruke će koristiti manji font od pretpostavljenog."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Ne prikazuj avatar za sam transport."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Ne prikazuj listu kontakata u programskoj traci."
+
+#: ../src/common/config.py:238
+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 ""
+"Ako je Istinito, i instalirane verzije GTK+ i PyGTK su barem 2.8, neka "
+"prozor bljeska (pretpostavljeno ponašanje u većini Upravitelja Prozorima) "
+"pri novim događajima."
+
+#: ../src/common/config.py:240
+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 ne voli sha informacije kada netko uđe u grupni razgovor zaštićen "
+"lozinkom. Isključite ovu opciju da prestanete slati sha informacije u "
+"grupnim razgovorima"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Upravlja prozorom u koji su smještene nove poruke.\n"
+"'uvijek' - Sve poruke su poslane u isti prozor.\n"
+"'nikad' - Svaka poruka dobiva svoj prozor.\n"
+"'poracun' - Poruke za svaki račun su poslane u svoj prozor.\n"
+"'potipu' - Svaki tip poruke (npr., razgovori i grupni razgovori) je poslan u "
+"svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima kako bi "
+"se promjene primjenile."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Ako je Neistinito, nećete više vidjeti avatar u prozoru razgovora."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Ako je Istinito, pritisak na 'esc' tipku zatvara tab/prozor."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Skriva dugmad u prozoru grupnog razgovora."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Sakrije baner u prozoru grupnog razgovora"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Sakrije baner u prozoru razgovora dviju osoba"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
+
+#: ../src/common/config.py:250
+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 ""
+"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:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Pošalji poruku i zatvori prozor"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Lista boja koje će biti korištene za bojanje nadimaka u grupnim razgovorima."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab idi na sljedeći tab kada nema nepročitanih."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
+"niz znači da nikada ne prikazujemo upit."
+
+#: ../src/common/config.py:256
+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 ""
+"Ako je Istinito, biti ćete u mogućnosti postaviti negativni prioritet na vaš "
+"račun u prozoru za izmjenu postavki računa. BUDITE OPREZNI, kada ste "
+"prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
+"poslužitelja."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Ako je Istinito, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
+"pohranio lozinke računa."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Ako je Istinito, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
+"redovima za račune i grupe."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
+"poruke kao da su izabrane vrste"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Ako je Istinito, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
+"poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Ako je Istinito, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći "
+"dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
+
+#: ../src/common/config.py:262
+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:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
+"definirani u autopriority_* opcijama."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 workaround"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+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:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Je li OpenPGP omogućen za ovog kontakta?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Jezik u kojem želimo provjeriti krivo napisane riječi"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "sve ili razmakom odvojen status"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'da', 'ne', ili 'oboje'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'da', 'ne' ili ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Spavam"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Vraćam se ubrzo"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Vraćam se za nekoliko minuta."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Jedem"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Jedem, ostavite mi poruku."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Gledam film."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Radim."
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Radim."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Telefoniram."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Vani"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Vani uživam život."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Dostupan sam."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Slobodan sam za razgovor."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Odmah se vraćam."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Nedostupan sam."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Ne uznemiravaj."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Pozdrav!"
+
+#: ../src/common/config.py:441
+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 koji će biti pušten kada poruka grupnog razgovora sadrži neku riječ iz "
+"muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
+"nadimak."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "zelena"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "namirnice"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "ljudska"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "morska"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Nije moguće učitati modul idle"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Krivi domaćin"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr "Neispravna lokalna adresa? :-O"
+
+#: ../src/common/connection_handlers.py:639
+#, 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:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Produžetak nije podržan"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nedozvoljeni nadimak: %s "
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Zabranjen vam je pristup ovom grupnom razgovoru."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Takav grupni razgovor ne postoji."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Stvaranje grupnih razgovora je ograničeno."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Morate koristiti vaš registrirani nadimak."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Niste u listi članova."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+msgid "Room has been destroyed"
+msgstr "Soba je uništena"
+
+#: ../src/common/connection_handlers.py:2116
+#, 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:2143
+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:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "sada smo pretplaćeni na %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Zahtjev za ukidanjem pretplate od %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "sada smo ukinuli pretplatu za %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s ne poštuje RFC pravila. Neće biti dodan na vašu listu kontakata. "
+"Upotrijebite alate za upravljanje listom kontakata kao što je http://jru."
+"jabberstudio.org/ za uklanjanje"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Lozinka za OpenPGP nije unešena"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Biti će te spojeni na %s bez OpenPGP-a."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Nije moguće učitati modul idle"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+#, fuzzy
+msgid "CRL is not yet valid"
+msgstr "%s nije valjana razina zapisnika (loglevel)"
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Veza sa računom \"%s\" je izgubljena"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Ponovo se spojite ručno."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Nepravilan odgovor"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s"
+
+#: ../src/common/connection.py:522
+msgid "Connection to proxy failed"
+msgstr "Veza na proxy nije uspjela"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nije moguća veza sa \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Provjerite svoju vezu ili pokušajte kasnije."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Nije moguća veza sa \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Veza sa računom \"%s\" je izgubljena"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autentifikacija sa \"%s\" nije uspjela"
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Molimo vas da provjerite korisničko ime i lozinku za greške."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Greška prilikom brisanja liste privatnosti"
+
+#: ../src/common/connection.py:801
+#, 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 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:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Ova poruka je *kriptirana* (Vidi :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tema: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Posmatrači"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Prijenosi"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Nije na Listi Kontakata"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Ovom računalu nedostaju D-Bus python poveznice"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Ime računa ne može biti prazno."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Servis nije dostupan: Gajim nije pokrenut ili je remote_control Neistinito"
+
+#: ../src/common/exceptions.py:63
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sesijska sabirnica nije dostupna.\n"
+"Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "jedan"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "dva"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tri"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "četiri"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "pet"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "šest"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "sedam"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "osam"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "devet"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "deset"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "jedanaest"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "dvanaest"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 sati"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "pet poslije $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "deset poslije $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "četvrt poslije $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "dvadeset poslije $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "dvadeset pet poslije $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "$0 i pola"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "dvadeset i pet do $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "dvadeset do $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "četvrt do $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "deset do $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "pet do $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 sati"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Noć"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Rano jutro"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Jutro"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Skoro podne"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Podne"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Poslijepodne"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Večer"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Kasna večer"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Početak tjedna"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Sredina tjedna"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Kraj tjedna"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Vikend!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Neispravan znak u korisničkom imenu."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Potrebna je adresa poslužitelja."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Neispravan znak u imenu računala."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Neispravan znak u resursu."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Zauzet"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Zauzet"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Nedostupan"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Slobodan za razgovor"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Slobodan za razgovor"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Dostupan"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Dostupan"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Povezujem"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "O_dsutan"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Odspojen"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Odspojen"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Nevidljiv"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?kontakt ima status:Nepoznat"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?kontakt ima status:Ima greške"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Pretplata koju već imamo:Ništa"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Za"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Oboje"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Pitaj (za Pretplatu):Ništa"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Pretplatite se"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderatori"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderator"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Sudionici"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Sudionik"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Posjetitelji"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Posjetitelj"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Vlasnik"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Član"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "obraća pažnju na razgovor"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "radi nešto drugo"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "piše poruku..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "stanka pri pisanju poruke"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "je zatvorio/zatvorila prozor za razgovor"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Pošalji poruku"
+msgstr[1] "Pošalji poruku"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "Grupa %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "greška: nemogu otvoriti %s za čitanje"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cijan"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "migriram bazu zabilješki u indekse"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim račun %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pauza"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Podebljano"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Imam "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Razgovori"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Podebljano"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Sadržaj"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Završeno"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Sadržaj"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Neaktivno"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "uri"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Obriši"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Odspojen"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:233
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Onemogućeno"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Aktivno"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupa"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Poslužitelj:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "poruka"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Aktivno"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Nevidljiv"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "jedan"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Poslužitelj:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Njemački"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Izmjeni"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Odspojen"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupa"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "jedanaest"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Zaustavljeno"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Posljednja izmjena:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Nadimak"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Spavam"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Ulica:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Pretplaćeno"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Vrijeme"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "devet"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Krivi domaćin"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Večer"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Pisanje"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Jutro"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "sve u grupi"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Radim."
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Večer"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Izbacujem %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Pridruživanje"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Radim."
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Radim."
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "soba"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Jedem"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Mijenjanje Teme"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Izbacujem %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Jedem"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Radim."
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Izbacujem %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Jedem"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Se odjavi"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Jedem"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Razlog"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Razlog"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Spavam"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Radim."
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Jedem"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Gledam film."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Jedem"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Telefoniram."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Prenosim"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Pisanje"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Spojen"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Otvori kao _Poveznicu"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Radim."
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Pisanje"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Radim."
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Nemoguće vezanje na port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će biti "
+"otkazan."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Vezu sa domaćinom nije moguće ostvariti: Isteklo vrijeme za slanja podataka."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju nije "
+"ispravan, biti će ignoriran."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno "
+"spojiti."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahi greška"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Poruke lokalne veze možda ne rade kako treba."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Molimo provjerite da je Avahi instaliran."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Nije moguće pokrenuti lokalnu uslugu"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Nemoguće vezanje na port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Molimo provjerite da li je avahi-daemon pokrenut."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Svakih %s _minuta"
+msgid "Could not change status of account \"%s\""
+msgstr "Nije moguće promjeniti status računa \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati."
 
-#: ../src/config.py:353
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Ova poruka je kriptirana]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Greška prilikom dodavanja usluge. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:684 ../src/dialogs.py:941
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Predefinirana Statusna Poruka"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Omogući"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Osobni</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:685
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2725,246 +5874,254 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/config.py:1008
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1008
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:1045
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Sljedeća Poruka Primljena"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Sljedeća Poruka Primljena"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
-#: ../src/config.py:1260
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Ime"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Prijaviti se odmah?"
+
+#: ../src/config.py:1406
+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:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računalu"
 
-#: ../src/config.py:1306
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Nepročitani događaji"
+
+#: ../src/config.py:1667
+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:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Otvorili ste razgovor u računu %s"
+
+#: ../src/config.py:1694
+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:1705
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1310 ../src/config.py:1916
-msgid "Unread events"
-msgstr "Nepročitani događaji"
-
-#: ../src/config.py:1311
+#: ../src/config.py:1710
 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:1315
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1316
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molimo odaberite drugo ime."
 
-#: ../src/config.py:1320 ../src/config.py:1324
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1321
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1325
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1333 ../src/config.py:1339 ../src/config.py:1349
-#: ../src/config.py:2897
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Podešavanje Računa"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Unesite novo ime za grupu %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/config.py:1340
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:1399 ../src/config.py:2968
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:1400 ../src/config.py:2969
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:1528 ../src/common/config.py:370
-msgid "Be right back."
-msgstr "Odmah se vraćam."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:1538
-msgid "Relogin now?"
-msgstr "Prijaviti se odmah?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:1539
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Odabir OpenPGP Ključeva"
+
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:1565
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:1573 ../src/dialogs.py:1225 ../src/dialogs.py:1361
-#: ../src/dialogs.py:1541 ../src/disco.py:420 ../src/profile_window.py:329
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:1574
+#: ../src/config.py:2097
 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:1578
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:1579
+#: ../src/config.py:2102
 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:1610 ../src/config.py:3400
-msgid "Failed to get secret keys"
-msgstr "Neuspješno dohvaćanje tajnih ključeva"
-
-#: ../src/config.py:1611 ../src/config.py:3401
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
-
-#: ../src/config.py:1614 ../src/config.py:3404
-msgid "OpenPGP Key Selection"
-msgstr "Odabir OpenPGP Ključeva"
-
-#: ../src/config.py:1615 ../src/config.py:3405
-msgid "Choose your OpenPGP key"
-msgstr "Odaberite svoj OpenPGP ključ"
-
-#. Name column
-#: ../src/config.py:1850 ../src/dialogs.py:1373 ../src/dialogs.py:1437
-#: ../src/disco.py:741 ../src/disco.py:1564 ../src/disco.py:1802
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Ime"
-
-#: ../src/config.py:1853 ../src/dialogs.py:1376
-msgid "Server"
-msgstr "Poslužitelj"
-
-#: ../src/config.py:1917
-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:1954
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Otvorili ste razgovor u računu %s"
-
-#: ../src/config.py:1955
-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:2014
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2015
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Molimo uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
 
-#: ../src/config.py:2153
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2155
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2191
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2192
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2193
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2194
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2243 ../src/disco.py:748 ../src/history_manager.py:155
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2251
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2256
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2260
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2285
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2287
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2972,11 +6129,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2289
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2290
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2984,11 +6141,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2292
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2293
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2996,11 +6153,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2295
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2296
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -3008,7 +6165,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2297
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3024,85 +6181,85 @@ 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:2401
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2418 ../src/roster_window.py:3123
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2419 ../src/roster_window.py:3119
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2420 ../src/roster_window.py:3124
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2434
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2435
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2520
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:2520
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:2521
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Ući i samo napustiti"
 
-#: ../src/config.py:2522
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:2624
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu "
 "oznaku."
 
-#: ../src/config.py:2880
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:2882
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:2908
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Dvostruki Jabber ID"
 
-#: ../src/config.py:2909
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Ovaj račun je već konfiguriran u Gajimu."
 
-#: ../src/config.py:2926
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:2927 ../src/config.py:3071
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3111,216 +6268,296 @@ msgstr ""
 "Napredne opcije računa možete podesiti pritiskom na gumb Napredno, ili "
 "kasnije klikom na element Računi pod izbornikom Uredi iz glavnog prozora."
 
-#: ../src/config.py:2944
+#: ../src/config.py:3137
 #, fuzzy
 msgid "Invalid server"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:2945
+#: ../src/config.py:3138
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte novi nadimak ako ga želite koristiti:"
 
-#: ../src/config.py:3050 ../src/config.py:3088
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kontakt je već na listi"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3070
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/conversation_textview.py:279
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Tekst niže od ove linije je ono što je rečeno od kad ste zadnji puta "
 "obraćali pozornost na ovaj grupni razovor"
 
-#: ../src/conversation_textview.py:348
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:360
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:365
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:381
+#: ../src/conversation_textview.py:712
 #, 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:394
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:403
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
-#: ../src/conversation_textview.py:848
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Jučer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:852
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Prije %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:886
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dialogs.py:60
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM Klijent"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:62
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:212
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:219
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:270
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "ID ključa"
 
-#: ../src/dialogs.py:273
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:319
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Postavi MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:321
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Statusna Poruka"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Ovo ime već koristi vaš drugi račun. Molimo odaberite drugo ime."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:422
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:443
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Adresa:"
 
-#: ../src/dialogs.py:444
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:445
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:446
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Adresa:"
 
-#: ../src/dialogs.py:447
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresa:"
 
-#: ../src/dialogs.py:483
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo ispunite podatke kontakta kojeg želite dodati u račun %s"
 
-#: ../src/dialogs.py:485
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:635 ../src/dialogs.py:641
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:642
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:656
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Želio bih te dodati na moju listu kontakata."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:657
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:694
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:757
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:775
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:791
+#: ../src/dialogs.py:1035
 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:804
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -3328,20 +6565,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:934
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nemoguće vezanje na port %s."
-
-#: ../src/dialogs.py:935
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će biti "
-"otkazan."
-
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -3353,75 +6577,90 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1155
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtjev pretplate za račun %s od %s"
 
-#: ../src/dialogs.py:1158
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:1218 ../src/roster_window.py:743
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1686
 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:1241
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:1309 ../src/dialogs.py:1315
-#: ../src/groupchat_control.py:1536
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:1310 ../src/dialogs.py:1316
-#: ../src/groupchat_control.py:1537
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:1322
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:1323
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:1362
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:1409
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Poslužitelj"
+
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1870
 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:1434
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:1492
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:1495
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3430,296 +6669,377 @@ msgstr ""
 "poslati razgovornu poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1520 ../src/dialogs.py:1877 ../src/dialogs.py:2008
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:1521 ../src/dialogs.py:1878 ../src/dialogs.py:2009
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:1530 ../src/dialogs.py:1533
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:1533
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:1542
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:1560
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:1561
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:1566
+#: ../src/dialogs.py:2025
 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:1608 ../src/notify.py:214 ../src/notify.py:418
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: ../src/dialogs.py:1610 ../src/notify.py:222 ../src/notify.py:420
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #. chat message
-#: ../src/dialogs.py:1612 ../src/notify.py:241 ../src/notify.py:422
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:1612 ../src/notify.py:226 ../src/notify.py:422
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #. private message
-#: ../src/dialogs.py:1613 ../src/notify.py:233 ../src/notify.py:423
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:1613 ../src/gajim.py:1350 ../src/notify.py:431
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:1615 ../src/gajim.py:1503 ../src/notify.py:425
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:1617 ../src/gajim.py:1322 ../src/gajim.py:1479
-#: ../src/notify.py:427
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:1619 ../src/gajim.py:1542 ../src/gajim.py:1564
-#: ../src/gajim.py:1581 ../src/notify.py:429
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:1620 ../src/gajim.py:1545 ../src/notify.py:429
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:1622 ../src/gajim.py:1218 ../src/notify.py:433
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:1624 ../src/notify.py:206 ../src/notify.py:435
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: ../src/dialogs.py:1807
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:1809
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1814
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1837
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, python-format
+msgid "Form %s"
+msgstr ""
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1909
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1910
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:1956
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2083
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:2141
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Redoslijed: %s, akcija: %s, tip: %s, vrijednost: %s"
 
-#: ../src/dialogs.py:2144
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %s, akcija: %s"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:2273
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:2362
-#, python-format
-msgid "Blocked Contacts for %s"
-msgstr "Blokirani Kontakti za %s"
-
-#: ../src/dialogs.py:2364
-msgid "Blocked Contacts"
-msgstr "Blokirani Kontakti"
-
-#: ../src/dialogs.py:2433
-#, python-format
-msgid "Group %s"
-msgstr "Grupa %s"
-
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:2466
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:2536
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:2537
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2571
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Niste se  pridružili grupnom razgovoru"
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2583
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:2645
+#: ../src/dialogs.py:2978
+#, fuzzy
+msgid "Do you want to accept the invitation?"
+msgstr "Želite li poslati tu datoteku kontaktu %s:"
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:2655 ../src/dialogs.py:2700
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:2660
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:2705
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:2764
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
 #. # means number
-#: ../src/dialogs.py:2835
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2841
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/dialogs.py:2962
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/disco.py:104
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Ostali"
 
-#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1350
-#: ../src/gajim.py:613 ../src/roster_window.py:273 ../src/roster_window.py:332
-#: ../src/roster_window.py:371 ../src/roster_window.py:471
-#: ../src/roster_window.py:503 ../src/roster_window.py:505
-#: ../src/roster_window.py:4358 ../src/roster_window.py:4360
-#: ../src/common/contacts.py:275 ../src/common/contacts.py:290
-#: ../src/common/helpers.py:43
-msgid "Transports"
-msgstr "Prijenosi"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:108
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:500
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:502
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3727,42 +7047,47 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 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:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretraga %s koristeći račun %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1147
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Izvrši Naredbu..."
 
-#: ../src/disco.py:1157 ../src/disco.py:1355
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1392
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Korisnici"
 
@@ -3772,164 +7097,415 @@ msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1587
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: ../src/disco.py:1836
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ništa"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1842
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:1848
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Upravitelj Povijesti"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Poruka Poslana"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Identifikacija"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP Enkripcija"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Dolazna poruka:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Općenito"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Mogućnosti Poslužitelja"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Vrijeme"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:161 ../src/filetransfers_window.py:215
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:162 ../src/filetransfers_window.py:290
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:171 ../src/filetransfers_window.py:181
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:172
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:585
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Primatelj: "
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Spremljeno u: %s"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Prijenos datoteka završen"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:206
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Prijenos datoteka otkazan"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:207
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Vezu nije moguće ostvariti."
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Prijenos datoteka je otkazao kontakt na drugoj strani"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Odabir Datoteke za Slanje..."
 
-#: ../src/filetransfers_window.py:255
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Opis: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:310 ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:311 ../src/gtkgui_helpers.py:769
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:318 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Å to želite učiniti?"
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:783
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:784
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
-#: ../src/filetransfers_window.py:340
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Snimiti Datoteku kao..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:421
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3937,65 +7513,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:497
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Neispravna Datoteka"
 
-#: ../src/filetransfers_window.py:536
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:540
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:575
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:579
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: ../src/filetransfers_window.py:750
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s nije valjana razina zapisnika (loglevel)"
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim treba X server za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:186
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim treba pyGTK 2.8 ili viši"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.8 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim treba GTK 2.8 ili viši"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim treba GTK 2.8 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ nema podršku za libglade"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -4004,21 +7580,21 @@ msgstr ""
 "Molimo uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu "
 "verziju sa %s"
 
-#: ../src/gajim.py:139
+#: ../src/gajim.py:199
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Molimo provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu"
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim treba PySQLite2 za pokretanje"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -4028,11 +7604,11 @@ msgstr ""
 "na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:300
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:301
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -4040,83 +7616,169 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim.py:408
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Potrebna Lozinka"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Unesite lozinku GPG ključa za račun %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Kriva Lozinka"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Molimo ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Vaš željeni nadimak se trenutno koristi ili je registriran od strane nekog "
+"od učesnika.\n"
+"Molimo niže odredite drugi nadimak:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gajim.py:411
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Prihvaćate li ovaj zahtjev?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizacija za %s (id: %s)"
 
-#: ../src/gajim.py:458 ../src/notify.py:437
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/gajim.py:788
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:832 ../src/gajim.py:845
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %s ( %s )"
 
-#: ../src/gajim.py:878
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:879
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
 
-#: ../src/gajim.py:887
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gajim.py:888
-msgid "You will always see him or her as offline."
-msgstr "Uvijek ćete vidjeti njega ili nju kao nepriključenog."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:932
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: ../src/gajim.py:933 ../src/common/connection.py:423
-msgid "Check your connection or try again later."
-msgstr "Provjerite svoju vezu ili pokušajte kasnije."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s je od sada poznat kao %s"
 
-#: ../src/gajim.py:1100 ../src/roster_window.py:1302
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s je sada %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1103 ../src/groupchat_control.py:1023
-#: ../src/roster_window.py:1305
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s je sada %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1228
-msgid "Your passphrase is incorrect"
-msgstr "Vaša lozinka nije točna"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
 
-#: ../src/gajim.py:1229
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Potrebna je lozinka za pridruživanje ovom grupnom razgovoru."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gajim.py:1333
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Vaša lozinka nije točna"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1335
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -4124,113 +7786,224 @@ msgstr[0] "Imate %d novi E-mail razgovor"
 msgstr[1] "Imate %d nova E-mail razovora"
 msgstr[2] "Imate %d novih E-mail razgovora"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1344
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Od: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gajim.py:1565
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspješno ste primili %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1569
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: ../src/gajim.py:1582
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Na svaku _poruku"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:1719
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Molimo unesite novo korisničko ime za vaš lokalni račun"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1744
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1750
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: ../src/gajim.py:1776
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
 
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Veza"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Upravo ćete stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Enkripcija onemogućena"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: ../src/gajim.py:2330
-msgid "Network Manager support not available"
-msgstr "Podrška za Upravitelja Mrežom nije dostupna"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Knjižna oznaka je već postavljena"
+
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
 
-#: ../src/gajim.py:2403
-msgid "Session Management support not available (missing gnome.ui module)"
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Knjižna oznaka je bez uspješno dodana"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
-"Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)"
+"Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
+"spisku."
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -4238,49 +8011,49 @@ msgstr ""
 "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
 "odvojenoj liniji"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "račun"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, "
 "nevidljiv"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "poruka"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4289,19 +8062,19 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dialog razgovora kako bi mogli slati poruke kontaktu"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je označeno, kontak se uzima sa kontakt liste ovog računa"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:128
 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 "
@@ -4311,27 +8084,29 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite "
 "'OpenPGP ključ' na ''."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141
 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 "
@@ -4341,126 +8116,135 @@ msgstr ""
 "želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID kontakta koji će primiti poruku"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvaranje dialoga 'Započeti Razgovor'"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4468,35 +8252,72 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Rukuj xmpp:/ adresama"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Pridruživanje Novoj Sobi"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Soba:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Nadimak nije pronađen: %s "
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Lozinke se ne podudaraju"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Molimo provjerite da li je avahi-daemon pokrenut."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Prikazuje ili skriva prozor liste"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4505,29 +8326,31 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molimo odredite račun za slanje poruke."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Korištenje: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4536,130 +8359,200 @@ msgstr ""
 "Korištenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:438
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%s help %s\" za više informacija"
 
-#: ../src/gajim-remote.py:442
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argument \"%s\" nije određen. \n"
 "Unesite \"%s help %s\" za više informacija"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Krivi uri"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Ne možete izbrisati svoju trenutnu temu"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "ime teme"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati svoju trenutnu temu"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Molimo vas da prvo odaberete neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Više niste u grupnom razgovoru \"%s\" ili je \"%s\" otišao."
 
-#: ../src/groupchat_control.py:330
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Povijest razgovora"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Veza"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Soba je uništena"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:873
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:877
+#: ../src/groupchat_control.py:1142
 #, 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:884
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:888
+#: ../src/groupchat_control.py:1153
 #, 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:896
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:898
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Pripadnost:"
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s je od sada poznat kao %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s je izbačen: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1021
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1149 ../src/groupchat_control.py:1167
-#: ../src/groupchat_control.py:1260 ../src/groupchat_control.py:1277
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
 
-#: ../src/groupchat_control.py:1183
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1203 ../src/groupchat_control.py:1231
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s ne izgleda kao valjani JID"
-
-#: ../src/groupchat_control.py:1314
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Ne postoji komanda: /%s (ako želite poslati to kao poruku, prefiksirajte je "
-"sa /say)"
-
-#: ../src/groupchat_control.py:1340
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4672,7 +8565,7 @@ msgstr ""
 "trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima NISU "
 "podržani."
 
-#: ../src/groupchat_control.py:1347
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4681,7 +8574,7 @@ msgstr ""
 "Način korištenja: /%s <nickname>, otvara privatni razgovor sa navedenim "
 "učesnikom."
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4690,7 +8583,7 @@ msgstr ""
 "Način korištenja: /%s [razlog], zatvara trenutni prozor ili tab, i prikazuje "
 "razlog ako je specificiran."
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4699,7 +8592,7 @@ msgstr ""
 "Način korištenja: /%s <JID> [razlog], poziva JID u trenutni grupni razgovor, "
 "opcionalno dajući razlog."
 
-#: ../src/groupchat_control.py:1363
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4708,7 +8601,7 @@ msgstr ""
 "Način korištenja: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost "
 "spajanja na sobu@poslužitelj koristeći navedeni nadimak."
 
-#: ../src/groupchat_control.py:1367
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4719,16 +8612,7 @@ msgstr ""
 "nadimkom iz grupnog razgovora i opcionalno prikazuje razlog. NE podržava "
 "razmake u nadimku."
 
-#: ../src/groupchat_control.py:1372
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Način korištenja: /%s <action>, šalje akciju trenutnom grupnom razgovoru. "
-"Koristite treću osobu. (npr. /%s eksplodira.)"
-
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4737,69 +8621,65 @@ msgstr ""
 "Način korištenja: /%s <nickname> [poruka], otvara prozor privatne poruke i "
 "šalje poruku učesniku navedenom nadimkom."
 
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Način korištenja: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom "
 "razgovoru."
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Način korištenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Način korištenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
 
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Način korištenja: /%s <message>, šalje poruku bez gledanja za ostale komande."
 
-#: ../src/groupchat_control.py:1458
+#: ../src/groupchat_control.py:1837
 #, 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:1460
+#: ../src/groupchat_control.py:1839
 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:1464 ../src/roster_window.py:4504
-msgid "Do _not ask me again"
-msgstr "_Ne pitaj me više"
-
-#: ../src/groupchat_control.py:1498
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1499
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Molimo specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1509
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo specificirajte novi nadimak ako ga želite koristiti:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1524
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1525
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -4807,139 +8687,120 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
-#: ../src/groupchat_control.py:1557
-msgid "Bookmark already set"
-msgstr "Knjižna oznaka je već postavljena"
-
-#: ../src/groupchat_control.py:1558
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
-
-#: ../src/groupchat_control.py:1567
-msgid "Bookmark has been added successfully"
-msgstr "Knjižna oznaka je bez uspješno dodana"
-
-#: ../src/groupchat_control.py:1568
-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."
-
 #. ask for reason
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1704 ../src/groupchat_control.py:1996
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1995
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Otkrivena je bila greška u programiranju"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr ""
 "Najvjerojatnije nije kobna, ali ipak preporučamo, da ju javite programerima."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Prijavi Grešku"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:359
 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:376
+#: ../src/gtkgui_helpers.py:396
 #, 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:711
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije zadani Jabber klijent"
 
-#: ../src/gtkgui_helpers.py:712
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li postaviti Gajim za zadani Jabber klijent?"
 
-#: ../src/gtkgui_helpers.py:713
+#: ../src/gtkgui_helpers.py:735
 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:812
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:813
+#: ../src/gtkgui_helpers.py:805
 #, 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:822
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zabilješki povijesti"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontakti"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4947,7 +8808,7 @@ msgstr ""
 "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM "
 "POKRENUT)"
 
-#: ../src/history_manager.py:189
+#: ../src/history_manager.py:226
 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 "
@@ -4961,162 +8822,175 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Izvozim Zabilješke Povijesti..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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] ""
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabrane poruke?"
 msgstr[2] ""
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Povijest Razgovora sa %s"
 
-#: ../src/history_window.py:266
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Greška."
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:270 ../src/notify.py:201
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s je trenutno %(status)s"
-
-#: ../src/history_window.py:276
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:279
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: ../src/htmltextview.py:604
+#: ../src/htmltextview.py:612
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:276
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:278
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:280
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:282
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../src/message_window.py:283
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:199
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: ../src/notify.py:209
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: ../src/notify.py:217
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: ../src/notify.py:229
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
 
-#: ../src/notify.py:237
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
 
-#: ../src/notify.py:238
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:244
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Općenito"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:127 ../src/vcard.py:135
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:130 ../src/vcard.py:138
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:144 ../src/profile_window.py:160
-#: ../src/vcard.py:140 ../src/vcard.py:151
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: ../src/profile_window.py:261
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Primljene informacije"
 
-#: ../src/profile_window.py:330
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez veze ne možete objaviti informacije o sebi"
 
-#: ../src/profile_window.py:342
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Šaljem profil..."
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:364
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Objava vCard neuspješna"
 
-#: ../src/profile_window.py:365
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -5124,87 +8998,89 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:173 ../src/roster_window.py:228
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:347 ../src/roster_window.py:602
-#: ../src/common/helpers.py:43
-msgid "Observers"
-msgstr "Posmatrači"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:373 ../src/roster_window.py:429
-#: ../src/roster_window.py:434 ../src/roster_window.py:2442
-#: ../src/common/commands.py:194 ../src/common/contacts.py:89
-#: ../src/common/helpers.py:43
-msgid "Groupchats"
-msgstr "Grupni Razgovori"
+#: ../src/roster_window.py:1861
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:752 ../src/roster_window.py:3651
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Zahtjev za pretplatom je poslan"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:968 ../src/systray.py:206 ../src/systray.py:211
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using account %s"
-msgstr "koristeći račun %s"
+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."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:993
-#, python-format
-msgid "to %s account"
-msgstr "na %s račun"
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Odobrenje je uklonjeno"
 
-#. disco
-#: ../src/roster_window.py:998
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "using %s account"
-msgstr "koristeći %s račun"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#. profile, avatar
-#: ../src/roster_window.py:1073
-#, python-format
-msgid "of account %s"
-msgstr "računa %s"
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring je instaliran, ali nije ispravno pokrenut (vjerovatno "
+"varijabla okruženja nije ispravno postavljena)"
 
-#: ../src/roster_window.py:1093
-msgid "_Manage Bookmarks..."
-msgstr "Upravljanje Knjižni_m Oznakama..."
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#: ../src/roster_window.py:1122
-#, python-format
-msgid "for account %s"
-msgstr "za račun %s"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#. History manager
-#: ../src/roster_window.py:1143
-msgid "History Manager"
-msgstr "Upravitelj Povijesti"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:1152
-msgid "_Join New Group Chat"
-msgstr "Pridružit_i se Novom Grupnom Razgovoru"
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1493 ../src/roster_window.py:3847
-#: ../src/roster_window.py:3854
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:1494
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
+"povijest."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:1497
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:1498
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5212,136 +9088,66 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:1501
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:1506
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovog "
 "prijenosa:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1672
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:1673
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:1680
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:1681
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:1756
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:1757
+#: ../src/roster_window.py:2734
 #, 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:1758
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno ukloni i sve kontakte sa ove grupe sa liste kontakata"
 
-#: ../src/roster_window.py:1789
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:1790
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:2030 ../src/roster_window.py:2324
-msgid "_New group chat"
-msgstr "_Novi grupni razgovor"
-
-#: ../src/roster_window.py:2175
-msgid "I would like to add you to my roster"
-msgstr "Želio bih vas dodati na svoju listu kontakata"
-
-#: ../src/roster_window.py:2369 ../src/roster_window.py:2476
-msgid "Send Group M_essage"
-msgstr "Pošalji _Grupnu Poruku"
-
-#: ../src/roster_window.py:2406
-msgid "_Maximize"
-msgstr "_Maksimiziraj"
-
-#: ../src/roster_window.py:2455
-msgid "Re_name"
-msgstr "Pre_imenuj"
-
-#: ../src/roster_window.py:2482
-msgid "To all users"
-msgstr "Svim korisnicima"
-
-#: ../src/roster_window.py:2485
-msgid "To all online users"
-msgstr "Svim spojenim korisnicima"
-
-#: ../src/roster_window.py:2505
-msgid "Send Cus_tom Status"
-msgstr "Šalje Prila_gođeni Status"
-
-#: ../src/roster_window.py:2562
-msgid "_Log on"
-msgstr "_Prijava"
-
-#: ../src/roster_window.py:2572
-msgid "Log _off"
-msgstr "_Odjava"
-
-#: ../src/roster_window.py:2694 ../src/roster_window.py:2765
-msgid "_Change Status Message"
-msgstr "_Izmjena Statusne Poruke"
-
-#: ../src/roster_window.py:2837
-msgid "Authorization has been sent"
-msgstr "Odobrenje je poslano"
-
-#: ../src/roster_window.py:2838
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Sada će \"%s\" znati vaš status."
-
-#: ../src/roster_window.py:2858
-msgid "Subscription request has been sent"
-msgstr "Zahtjev za pretplatom je poslan"
-
-#: ../src/roster_window.py:2859
-#, 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:2871
-msgid "Authorization has been removed"
-msgstr "Odobrenje je uklonjeno"
-
-#: ../src/roster_window.py:2872
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
-
-#: ../src/roster_window.py:3070
+#: ../src/roster_window.py:3128
 #, 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:3074
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5349,7 +9155,13 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno i uklanjate odobrenje što konačno znači da "
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3079
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Å to želite učiniti?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5357,16 +9169,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:3082
+#: ../src/roster_window.py:3144
 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:3086
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3090
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5376,96 +9188,35 @@ 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:3122
-msgid ""
-"Gnome Keyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-msgstr ""
-"Gnome Keyring je instaliran, ali nije ispravno pokrenut (vjerovatno "
-"varijabla okruženja nije ispravno postavljena)"
-
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:3150 ../src/common/connection.py:692
-#: ../src/common/zeroconf/connection_zeroconf.py:164
-#, 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:3167
-msgid "Passphrase Required"
-msgstr "Potrebna Lozinka"
-
-#: ../src/roster_window.py:3168
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Unesite lozinku GPG ključa za račun %s."
-
-#: ../src/roster_window.py:3173
-msgid "Save passphrase"
-msgstr "Sačuvati lozinku"
-
-#: ../src/roster_window.py:3181
-msgid "Wrong Passphrase"
-msgstr "Kriva Lozinka"
-
-#: ../src/roster_window.py:3182
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Molimo ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
-
-#: ../src/roster_window.py:3252 ../src/roster_window.py:3320
-msgid "You are participating in one or more group chats"
-msgstr "Sudjelujete u jednom ili više grupnih razovora"
-
-#: ../src/roster_window.py:3253 ../src/roster_window.py:3321
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:3278
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3279
+#: ../src/roster_window.py:3192
 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:3401
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" od %(artist)s"
-
-#: ../src/roster_window.py:3848 ../src/roster_window.py:3855
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
-"povijest."
-
-#: ../src/roster_window.py:4454
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:4456
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene na sljedećem spajanju."
 
-#: ../src/roster_window.py:4498
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:4500
+#: ../src/roster_window.py:3786
 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 "
@@ -5475,133 +9226,319 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:4578
-#, python-format
-msgid "Do you want to send that file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Neispravna Datoteka"
+
+#: ../src/roster_window.py:3910
+#, 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] "Želite li poslati tu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati te datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4683
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "koristeći račun %s"
+
+#. add
+#: ../src/roster_window.py:4674
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Spusti %s u grupu %s"
+msgid "to %s account"
+msgstr "na %s račun"
 
-#: ../src/roster_window.py:4690
+#. disco
+#: ../src/roster_window.py:4679
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Učini %s i %s pseudokontaktima"
+msgid "using %s account"
+msgstr "koristeći %s račun"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "Upravljanje Knjižni_m Oznakama..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "računa %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "za račun %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Izmjena Statusne Poruke"
+
+#: ../src/roster_window.py:4865
+msgid "Publish Tune"
+msgstr ""
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Aktivno"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Otkrivanje Usluga..."
+
+#: ../src/roster_window.py:5035
+#, fuzzy
+msgid "_Maximize All"
+msgstr "_Maksimiziraj"
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Pošalji _Grupnu Poruku"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Svim korisnicima"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Svim spojenim korisnicima"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Želio bih vas dodati na svoju listu kontakata"
 
-#: ../src/roster_window.py:4877
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Podešavanje Računa"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Pošalji Jednu Poruku"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Prijenosi"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Prikaži _Prijenose"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr "_Maksimiziraj"
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Odspojen"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Novi Grupni Razgovor"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Upravitelj Povijesti"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "Pridružit_i se Novom Grupnom Razgovoru"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
-#: ../src/systray.py:163
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/systray.py:251
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:502
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:506
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:414
+#: ../src/tooltips.py:432
 msgid " [blocked]"
 msgstr "[blokirano]"
 
-#: ../src/tooltips.py:418
+#: ../src/tooltips.py:436
 msgid " [minimized]"
 msgstr "[minimizirano]"
 
-#: ../src/tooltips.py:433 ../src/tooltips.py:622
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:464
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Zadnji status: %s"
 
-#: ../src/tooltips.py:466
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Spojen"
 
-#: ../src/tooltips.py:486
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Odspojen"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:513
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:523
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:578
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Soba:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Aktivno"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Vrsta:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:584
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Podizanje"
 
-#: ../src/tooltips.py:591
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:600 ../src/tooltips.py:621
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nije početo"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:606 ../src/tooltips.py:609
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Završeno"
 
-#: ../src/tooltips.py:613
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?status prijenosa:Stanka"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:617
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:619
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: ../src/tooltips.py:654
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5609,24 +9546,25 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: ../src/vcard.py:326
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:356 ../src/vcard.py:537
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:386
-msgid "Affiliation:"
-msgstr "Pripadnost:"
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Aplikacije</b>"
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5634,7 +9572,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: ../src/vcard.py:396
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5642,1498 +9580,428 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:398
+#: ../src/vcard.py:323
 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:400
+#: ../src/vcard.py:325
 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:408
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:412 ../src/vcard.py:439 ../src/vcard.py:562
-msgid " resource with priority "
-msgstr " resurs s prioritetom "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "kreiram bazu zabilješki"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, 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:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim će se sad isključiti"
-
-#: ../src/common/check_paths.py:115
-#, 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:131
-#, python-format
-msgid "creating %s directory"
-msgstr "kreiram %s direktorij"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Izmjeni informacije o statusu"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Promjeni status"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Postavi tip i opis prisustva"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Slobodan za razgovor"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Spojen"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Produženo odsustvo"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Ne uznemiravaj"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Neumreženo - prekid veze"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Opis prisustva:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Status je promjenjen."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s u %(room_name)s"
-
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Niste se  pridružili grupnom razgovoru"
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Novi Grupni Razgovor"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Izaberite grupne razgovore koje želite napustiti"
-
-#: ../src/common/commands.py:230
-msgid "You left the following groupchats:"
-msgstr "Napustili ste sljedeći grupni razgovor:"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Koristi DBus i Obavještajni-Demon za prikazivanje obavijesti"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr ""
-"Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Odsutan, kao posljedica mirovanja"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr ""
-"Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Nije dostupan, kao posljedica mirovanja."
-
-#: ../src/common/config.py:83
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Omogući lokalnu vezu/zeroconf poruke"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Jezik koji koristi pravopis"
-
-#: ../src/common/config.py:92
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'uvijek' - ispisuj vrijeme za svaku poruku.\n"
-"'ponekad' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
-"'nikada' - nikada ne ispisuj vrijeme."
-
-#: ../src/common/config.py:93
-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 ""
-"Ispisuj vrijeme u razgovorima koristeći Nejasni Sat. Vrijednost nejasnoće od "
-"1 do 4 ili 0 za onemogućavanje nejasnog sata. 1 je najprecizniji sat, 4 "
-"najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na "
-"'ponekad'."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Koristi * / _ parove kao znakove za formatiranje."
-
-#: ../src/common/config.py:97
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Ako je Istinito, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
-"omeđeno sa * *."
-
-#: ../src/common/config.py:100
-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 ""
-"Koristi ReStructured tekst markup za HTML i ascii formatiranje ako je "
-"odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/"
-"rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)"
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka "
-"tab) u grupnom razgovoru"
-
-#: ../src/common/config.py:110
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
-"razgovoru već koristi željeni nadimak"
-
-#: ../src/common/config.py:133
-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 ""
-"Ova postavka omogućava prilagođavanje vremenske oznake koja se ispisuje u "
-"razgovorima. Na primjer  \"[%H:%M] \" će prikazati \"[hour:minute] \". "
-"Pogledati python dokumentaciju za strftime za kompletan opis: http://docs."
-"python.org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Dodaj * i [n] u naslov liste?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/tab "
-"razgovora ponovno otvori."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
-"(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Ili je osobni url sa %s u njemu gdje je %s riječ ili fraza ili 'WIKTIONARY' "
-"sta znaci da koristi wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
-
-#: ../src/common/config.py:154
-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 ""
-"Ako je Istinito, osluškuj D-Bus signale iz UpraviteljaMrežom i promjeni "
-"status računa (ako nemaju listen_to_network_manager postavljen na Neistinito "
-"i sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
-"samo_sastavljanje, onemogućeno."
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Prikazane obavijesti o statusu u prozoru razgovora. Može biti jedno od svi, "
-"samo_sastavljanje, onemogućeno."
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
-"ga svakih x minuta"
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Pitaj prije zatvaranja taba/prozora razgovora grupe."
-
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Uvijek pitaj prije zatvaranja taba/prozora grupnog razgovora u ovoj razmakom "
-"odjeljenoj listi jid-ova grupnog razgovora."
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Nikad ne pitaj prije zatvaranja taba/prozora grupnog razgovora u ovoj "
-"razmacima podjeljenoj listi jid-ova grupnog razgovora."
-
-#: ../src/common/config.py:164
-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 ""
-"Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
-"sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Obavijesti o svim događajima u ikoni trake radne površine."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Prikaži tab ako je otvoren samo jedan razgovor?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Prikaži granicu notesa sa tabovima u prozorima razgovora?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Prikaži gumb za zatvaranje u tabu?"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
-"razgovorima."
-
-#: ../src/common/config.py:190
-msgid "If True, autojoined bookmarked rooms will be minimized on startup."
-msgstr ""
-"Ako je Istinito, označene sobe kojima se automatski pristupa će biti "
-"minimizirane pri pokretanju."
-
-#: ../src/common/config.py:191
-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 ""
-"Ako je Istinito, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
-"upotrebljena samo ako je \"trayicon\" u upotrebi."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Ako je Istinito, Gajim će provjeriti da li je zadani jabber klijent pri "
-"svakom pokretanju."
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Ako je Istinito, Gajim će prikazvati ikonu na svakom tabu koji sadrži "
-"nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
-
-#: ../src/common/config.py:194
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"Ako je Istinito, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
-"svaki kontakt pod imenom kontakta na listi."
-
-#: ../src/common/config.py:196
-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 ""
-"Ako je Istinito, će Gajim poslati upit za avatar svaki kontakt, koji nije "
-"imao avatar ili je onaj u memoriji prestar"
-
-#: ../src/common/config.py:197
-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 ""
-"Ako je Neistinito, više nećete vidjeti statusnu poruku u razgovorima, kada "
-"kontakt promjeni svoj status i/ili statusnu poruku."
-
-#: ../src/common/config.py:198
-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 ""
-"može biti \"ništa\", \"sve\" ili \"ulaz_i_izlaz\". Ako je \"ništa\", Gajim "
-"više neće ispisivati statusnu liniju u grupnim razgovorima kada član "
-"promjeni svoj status i/ili izmjeni statusnu poruku. Ako je \"sve\", Gajim će "
-"prikazivati sve statusne poruke. Ako je \"ulaz_i_izlaz\" Gajim će "
-"prikazivati samo poruke tipa FOO je ušao/izašao u/iz sobe"
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed in."
-msgstr "Boja pozadine kontakata kada su se upravo prijavili."
-
-#: ../src/common/config.py:201
-msgid "Background color of contacts when they just signed out."
-msgstr "Boja pozadine kontakata kada su se upravo odjavili."
-
-#: ../src/common/config.py:203
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-"Ako je Istinito, vraćene poruke će koristiti manji font od pretpostavljenog."
-
-#: ../src/common/config.py:204
-msgid "Don't show avatar for the transport itself."
-msgstr "Ne prikazuj avatar za sam transport."
-
-#: ../src/common/config.py:205
-msgid "Don't show roster in the system taskbar."
-msgstr "Ne prikazuj listu kontakata u programskoj traci."
-
-#: ../src/common/config.py:206
-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 ""
-"Ako je Istinito, i instalirane verzije GTK+ i PyGTK su barem 2.8, neka "
-"prozor bljeska (pretpostavljeno ponašanje u većini Upravitelja Prozorima) "
-"pri novim događajima."
-
-#: ../src/common/config.py:208
-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 ne voli sha informacije kada netko uđe u grupni razgovor zaštićen "
-"lozinkom. Isključite ovu opciju da prestanete slati sha informacije u "
-"grupnim razgovorima"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:211
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Upravlja prozorom u koji su smještene nove poruke.\n"
-"'uvijek' - Sve poruke su poslane u isti prozor.\n"
-"'nikad' - Svaka poruka dobiva svoj prozor.\n"
-"'poracun' - Poruke za svaki račun su poslane u svoj prozor.\n"
-"'potipu' - Svaki tip poruke (npr., razgovori i grupni razgovori) je poslan u "
-"svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima kako bi "
-"se promjene primjenile."
-
-#: ../src/common/config.py:212
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Ako je Neistinito, nećete više vidjeti avatar u prozoru razgovora."
-
-#: ../src/common/config.py:213
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Ako je Istinito, pritisak na 'esc' tipku zatvara tab/prozor."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in group chat window."
-msgstr "Skriva dugmad u prozoru grupnog razgovora."
-
-#: ../src/common/config.py:215
-msgid "Hides the buttons in two persons chat window."
-msgstr "Skriva gumbe u prozoru razgovora dviju osoba."
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in a group chat window"
-msgstr "Sakrije baner u prozoru grupnog razgovora"
-
-#: ../src/common/config.py:217
-msgid "Hides the banner in two persons chat window"
-msgstr "Sakrije baner u prozoru razgovora dviju osoba"
-
-#: ../src/common/config.py:218
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
-
-#: ../src/common/config.py:219
-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 ""
-"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:220
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
-
-#: ../src/common/config.py:221
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"Lista boja koje će biti korištene za bojanje nadimaka u grupnim razgovorima."
-
-#: ../src/common/config.py:222
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-Tab idi na sljedeći tab kada nema nepročitanih."
-
-#: ../src/common/config.py:223
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
-"niz znači da nikada ne prikazujemo upit."
-
-#: ../src/common/config.py:224
-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 ""
-"Ako je Istinito, biti ćete u mogućnosti postaviti negativni prioritet na vaš "
-"račun u prozoru za izmjenu postavki računa. BUDITE OPREZNI, kada ste "
-"prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
-"poslužitelja."
-
-#: ../src/common/config.py:225
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Ako je Istinito, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
-"pohranio lozinke računa."
-
-#: ../src/common/config.py:226
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Ako je Istinito, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
-"redovima za račune i grupe."
-
-#: ../src/common/config.py:227
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-msgstr ""
-"Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
-"poruke kao da su izabrane vrste"
-
-#: ../src/common/config.py:228
-msgid ""
-"If True, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
-msgstr ""
-"Ako je Istinito, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
-"poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
-
-#: ../src/common/config.py:229
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Ako je Istinito, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći "
-"dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
-
-#: ../src/common/config.py:230
-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:241
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
-"definirani u autopriority_* opcijama."
-
-#. yes, no, ask
-#: ../src/common/config.py:270
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 workaround"
-
-#: ../src/common/config.py:274
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-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:333
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Je li OpenPGP omogućen za ovog kontakta?"
-
-#: ../src/common/config.py:334 ../src/common/config.py:337
-msgid "Language for which we want to check misspelled words"
-msgstr "Jezik u kojem želimo provjeriti krivo napisane riječi"
-
-#: ../src/common/config.py:343
-msgid "all or space separated status"
-msgstr "sve ili razmakom odvojen status"
-
-#: ../src/common/config.py:344
-msgid "'yes', 'no', or 'both'"
-msgstr "'da', 'ne', ili 'oboje'"
-
-#: ../src/common/config.py:345 ../src/common/config.py:347
-#: ../src/common/config.py:348 ../src/common/config.py:351
-#: ../src/common/config.py:352
-msgid "'yes', 'no' or ''"
-msgstr "'da', 'ne' ili ''"
-
-#: ../src/common/config.py:358
-msgid "Sleeping"
-msgstr "Spavam"
-
-#: ../src/common/config.py:359
-msgid "Back soon"
-msgstr "Vraćam se ubrzo"
-
-#: ../src/common/config.py:359
-msgid "Back in some minutes."
-msgstr "Vraćam se za nekoliko minuta."
-
-#: ../src/common/config.py:360
-msgid "Eating"
-msgstr "Jedem"
-
-#: ../src/common/config.py:360
-msgid "I'm eating, so leave me a message."
-msgstr "Jedem, ostavite mi poruku."
-
-#: ../src/common/config.py:361
-msgid "Movie"
-msgstr "Film"
-
-#: ../src/common/config.py:361
-msgid "I'm watching a movie."
-msgstr "Gledam film."
-
-#: ../src/common/config.py:362
-msgid "Working"
-msgstr "Radim."
-
-#: ../src/common/config.py:362
-msgid "I'm working."
-msgstr "Radim."
-
-#: ../src/common/config.py:363
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../src/common/config.py:363
-msgid "I'm on the phone."
-msgstr "Telefoniram."
-
-#: ../src/common/config.py:364
-msgid "Out"
-msgstr "Vani"
-
-#: ../src/common/config.py:364
-msgid "I'm out enjoying life."
-msgstr "Vani uživam život."
-
-#: ../src/common/config.py:368
-msgid "I'm available."
-msgstr "Dostupan sam."
-
-#: ../src/common/config.py:369
-msgid "I'm free for chat."
-msgstr "Slobodan sam za razgovor."
-
-#: ../src/common/config.py:371
-msgid "I'm not available."
-msgstr "Nedostupan sam."
-
-#: ../src/common/config.py:372
-msgid "Do not disturb."
-msgstr "Ne uznemiravaj."
-
-#: ../src/common/config.py:373 ../src/common/config.py:374
-msgid "Bye!"
-msgstr "Pozdrav!"
-
-#: ../src/common/config.py:383
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Zvuk koji će biti pušten kada poruka grupnog razgovora sadrži neku riječ iz "
-"muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
-"nadimak."
-
-#: ../src/common/config.py:384
-msgid "Sound to play when any MUC message arrives."
-msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
-
-#: ../src/common/config.py:393 ../src/common/optparser.py:195
-msgid "green"
-msgstr "zelena"
-
-#: ../src/common/config.py:397 ../src/common/optparser.py:181
-msgid "grocery"
-msgstr "namirnice"
-
-#: ../src/common/config.py:401
-msgid "human"
-msgstr "ljudska"
-
-#: ../src/common/config.py:405
-msgid "marine"
-msgstr "morska"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Nije moguće učitati modul idle"
-
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/connection_handlers.py:215
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-msgid "Wrong host"
-msgstr "Krivi domaćin"
-
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju nije "
-"ispravan, biti će ignoriran."
-
-#: ../src/common/connection_handlers.py:216
-msgid "Invalid local address? :-O"
-msgstr "Neispravna lokalna adresa? :-O"
-
-#: ../src/common/connection_handlers.py:607
-#, 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:1573
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nedozvoljeni nadimak: %s "
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1640
-#: ../src/common/connection_handlers.py:1643
-#: ../src/common/connection_handlers.py:1646
-#: ../src/common/connection_handlers.py:1649
-#: ../src/common/connection_handlers.py:1652
-#: ../src/common/connection_handlers.py:1655
-#: ../src/common/connection_handlers.py:1663
-msgid "Unable to join group chat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: ../src/common/connection_handlers.py:1641
-msgid "A password is required to join this group chat."
-msgstr "Potrebna je lozinka za pridruživanje ovom grupnom razgovoru."
-
-#: ../src/common/connection_handlers.py:1644
-msgid "You are banned from this group chat."
-msgstr "Zabranjen vam je pristup ovom grupnom razgovoru."
-
-#: ../src/common/connection_handlers.py:1647
-msgid "Such group chat does not exist."
-msgstr "Takav grupni razgovor ne postoji."
-
-#: ../src/common/connection_handlers.py:1650
-msgid "Group chat creation is restricted."
-msgstr "Stvaranje grupnih razgovora je ograničeno."
-
-#: ../src/common/connection_handlers.py:1653
-msgid "Your registered nickname must be used."
-msgstr "Morate koristiti vaš registrirani nadimak."
-
-#: ../src/common/connection_handlers.py:1656
-msgid "You are not in the members list."
-msgstr "Niste u listi članova."
-
-#: ../src/common/connection_handlers.py:1664
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Vaš željeni nadimak se trenutno koristi ili je registriran od strane nekog "
-"od učesnika.\n"
-"Molimo niže odredite drugi nadimak:"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1692
-msgid "Room has been destroyed"
-msgstr "Soba je uništena"
-
-#: ../src/common/connection_handlers.py:1699
-#, 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:1726
-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:1747
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sada smo pretplaćeni na %s"
-
-#: ../src/common/connection_handlers.py:1749
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Zahtjev za ukidanjem pretplate od %s"
-
-#: ../src/common/connection_handlers.py:1751
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "sada smo ukinuli pretplatu za %s"
-
-#: ../src/common/connection_handlers.py:1870
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s ne poštuje RFC pravila. Neće biti dodan na vašu listu kontakata. "
-"Upotrijebite alate za upravljanje listom kontakata kao što je http://jru."
-"jabberstudio.org/ za uklanjanje"
-
-#: ../src/common/connection.py:197
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Veza sa računom \"%s\" je izgubljena"
-
-#: ../src/common/connection.py:198
-msgid "Reconnect manually."
-msgstr "Ponovo se spojite ručno."
-
-#: ../src/common/connection.py:209
-#, fuzzy, python-format
-msgid "Server %s answered wrongly to register request: %s"
-msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:220
-msgid "Invalid answer"
-msgstr "Nepravilan odgovor"
-
-#: ../src/common/connection.py:221
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s"
-
-#: ../src/common/connection.py:368
-msgid "Connection to proxy failed"
-msgstr "Veza na proxy nije uspjela"
-
-#: ../src/common/connection.py:422 ../src/common/connection.py:520
-#: ../src/common/connection.py:1051
-#: ../src/common/zeroconf/connection_zeroconf.py:236
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Nije moguća veza sa \"%s\""
-
-#: ../src/common/connection.py:436
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Povezan na poslužitelj %s:%s sa %s"
-
-#: ../src/common/connection.py:449
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Sigurnosna greška prilikom spajanja na \"%s\""
-
-#: ../src/common/connection.py:450
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr "Ključ servera se promjenio, ili netko pokušava prtljati po vašoj vezi."
-
-#: ../src/common/connection.py:457
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr "Nemoguće provjeriti potpis za %s. Veza može biti nesigurna."
-
-#: ../src/common/connection.py:499
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Nedostaje potpis u SSL vezi do %s"
-
-#: ../src/common/connection.py:505
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Potpis se ne slaže za %s: Dobiveno %s, očekivano %s"
-
-#: ../src/common/connection.py:521
-msgid "Check your connection or try again later"
-msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
-
-#: ../src/common/connection.py:547
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Autentifikacija sa \"%s\" nije uspjela"
-
-#: ../src/common/connection.py:548
-msgid "Please check your login and password for correctness."
-msgstr "Molimo vas da provjerite korisničko ime i lozinku za greške."
-
-#: ../src/common/connection.py:591
-msgid "Error while removing privacy list"
-msgstr "Greška prilikom brisanja liste privatnosti"
-
-#: ../src/common/connection.py:592
-#, 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 privatnosti %s nije uklonjena. Možda je aktivna u nekom od vaših "
-"spojenih resursa. Obustavite ju i pokušajte ponovno."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:690
-#: ../src/common/zeroconf/connection_zeroconf.py:162
-msgid "OpenPGP passphrase was not given"
-msgstr "Lozinka za OpenPGP nije unešena"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:847
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Ova poruka je *kriptirana* (Vidi :JEP:`27`]"
-
-#: ../src/common/connection.py:903
-#: ../src/common/zeroconf/connection_zeroconf.py:421
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Tema: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1075
-msgid "Not fetched because of invisible status"
-msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
-
-#: ../src/common/contacts.py:279
-msgid "Not in roster"
-msgstr "Nije na Listi Kontakata"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Ovom računalu nedostaju D-Bus python poveznice"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Servis nije dostupan: Gajim nije pokrenut ili je remote_control Neistinito"
-
-#: ../src/common/exceptions.py:38
-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:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sesijska sabirnica nije dostupna.\n"
-"Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "jedan"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "dva"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tri"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "četiri"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "pet"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " resurs s prioritetom "
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "šest"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP Enkripcija"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s nije ustupio OpenPGP ključ, niti mu je ikoji dodijeljen"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Ne postoji komanda: /%s (ako želite poslati to kao poruku, prefiksirajte "
+#~ "je sa /say)"
+
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Način korištenja: /%s <action>, šalje akciju trenutnom grupnom razgovoru. "
+#~ "Koristite treću osobu. (npr. /%s eksplodira.)"
+
+#~ msgid "Encryption enabled"
+#~ msgstr "Enkripcija omogućena"
+
+#~ msgid "Encryption disabled"
+#~ msgstr "Enkripcija onemogućena"
+
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Ako je označeno, svi lokalni kontakti koji koriste Bonjour kompatibilni "
+#~ "klijent za razgovor (kao iChat, Trillian ili Gaim) biti će prikazani na "
+#~ "listi kontakata. Ne morate biti spojeni na jabber poslužitelj kako bi ovo "
+#~ "radilo.\n"
+#~ "Ovo je dostupno samo ako je instaliran python-avahi i avahi-daemon je "
+#~ "pokrenut."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Ako imate 2 ili više računa i ovo je označeno, Gajim će prikazivati sve "
+#~ "kontakte kao da imate jedan račun"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Omogući poruke preko lokalne veze"
+
+#~ msgid "_Blocked Contacts"
+#~ msgstr "_Blokirani Kontakti"
+
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Pritisnite za pregled prošlih razgovora sa ovim kontaktom"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompaktan Pregled    Alt+K"
+
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Pritisnite za pregled proteklog razgovora u ovoj sobi"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "sedam"
+#, fuzzy
+#~ msgid "A_dministrator"
+#~ msgstr "Administrator"
+
+#~ msgid "Build custom query"
+#~ msgstr "Izgradi prilagođeno pretraživanje"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Graditelj Upita..."
+
+#~ msgid "Accept"
+#~ msgstr "Prihvati"
+
+#~ msgid "Invitation Received"
+#~ msgstr "Primljen Poziv"
+
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Format linije</b>"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Prilagođavanje Sučelja</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Poznato i kao iChat stil"
+
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Primjer: Ako ste omogućili statusnu poruku za odsutnost, Gajim vas neće "
+#~ "više pitati za statusnu poruku kada promjenite svoj status u odsutnost; "
+#~ "koristiti će onu postavljenu ovdje"
+
+#~ msgid "Chat"
+#~ msgstr "Razgovor"
+
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Utvrđeno po pošiljaocu\n"
+#~ "Razgovorna poruka\n"
+#~ "Jedna poruka"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "S_vakih 5 minuta"
+
+#~ msgid "Events"
+#~ msgstr "Događaji"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Gajim će automatski prikazivati nove događaje prikazujući bitan prozor"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim će vas obavijestiti o novim događajima sa popup prozorom u donjem "
+#~ "desnom kutu ekrana"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim će vas obavijestiti o kontaktima koji su se upravo prijavili sa "
+#~ "popup prozorom u donjem desnom kutu ekrana"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim će mjenjati ikonu samo onom kontaktu koji je potaknuo novi događaj"
+
+#~ 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 ""
+#~ "Ako je označeno, Gajim će se prisjetiti pozicije prozora liste kontakata "
+#~ "i razgovora, kao i njihove veličine kod sljedećeg pokretanja"
+
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Nikad\n"
+#~ "Uvijek\n"
+#~ "Ovisi o računu\n"
+#~ "Ovisi o tipu"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "osam"
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Noti_fikacije o statusu odlaznog razgovora"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "devet"
+#~ msgid "Print time:"
+#~ msgstr "Prikaz vremena:"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "deset"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Snimi _poziciju i veličinu za prozore liste kontakata i razgovora"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "jedanaest"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr ""
+#~ "Postavi statusnu poruku da odražava trenutno svirajuću _glazbenu traku"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "dvanaest"
+#~ msgid "Show only in _roster"
+#~ msgstr "Prikaži samo u _listi kontakata"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 sati"
+#~ msgid "The auto away status message"
+#~ msgstr "Statusna poruka automatske odsutnosti"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "pet poslije $0"
+#~ msgid "The auto not available status message"
+#~ msgstr "Statusna poruka automatske ne dostupnosti"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "deset poslije $0"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Tretiraj sve dolazne poruke kao:"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "četvrt poslije $0"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Koristi t_ray ikonu"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dvadeset poslije $0"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Kada se primi novi događaj (poruka, zahtjev za prijenosom datoteka i "
+#~ "sl.), mogu se koristiti sjedeće metode za obavijest. Imajte na umu da se "
+#~ "obavijesti o novim porukama prikazuju samo za kontakte sa kojima trenutno "
+#~ "ne razgovarate"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dvadeset pet poslije $0"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Radi sa Rhytmbox i Muine sviračima. Za više svirača, molimo posjetite "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 i pola"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Napredno Upravljanje Obavijestima..."
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dvadeset i pet do $1"
+#~ msgid "_Font:"
+#~ msgstr "_Font:"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dvadeset do $1"
+#~ msgid "_Never"
+#~ msgstr "_Nikada"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "četvrt do $1"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Obavijesti me o tome"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "deset do $1"
+#~ msgid "_Player:"
+#~ msgstr "_Player:"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "pet do $1"
+#~ msgid "_Pop it up"
+#~ msgstr "_Iskoči ga"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 sati"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Noć"
+#~ msgid "Address"
+#~ msgstr "Adresa:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Rano jutro"
+#~ msgid "City:"
+#~ msgstr "Mjesto:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Jutro"
+#~ msgid "Company:"
+#~ msgstr "Poduzeće:"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Skoro podne"
+#~ msgid "Country:"
+#~ msgstr "Država:"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Podne"
+#~ msgid "Given:"
+#~ msgstr "Dano:"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Poslijepodne"
+#~ msgid "Middle:"
+#~ msgstr "Srednje"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Večer"
+#~ msgid "Position:"
+#~ msgstr "Pozicija:"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Kasna večer"
+#~ msgid "Prefix:"
+#~ msgstr "Prefiks:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Početak tjedna"
+#~ msgid "Role:"
+#~ msgstr "Uloga:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Sredina tjedna"
+#~ msgid "State:"
+#~ msgstr "Država:"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Kraj tjedna"
+#~ msgid "Suffix:"
+#~ msgstr "Sufiks:"
 
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Vikend!"
+#~ msgid "Send cus_tom status"
+#~ msgstr "Pošalji prilagođeni status"
 
-#: ../src/common/helpers.py:114
-msgid "Invalid character in username."
-msgstr "Neispravan znak u korisničkom imenu."
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Ukloni sa Liste kontakata"
 
-#: ../src/common/helpers.py:119
-msgid "Server address required."
-msgstr "Potrebna je adresa poslužitelja."
+#~ msgid "A_ccounts"
+#~ msgstr "Korisnički računi"
 
-#: ../src/common/helpers.py:124
-msgid "Invalid character in hostname."
-msgstr "Neispravan znak u imenu računala."
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
 
-#: ../src/common/helpers.py:130
-msgid "Invalid character in resource."
-msgstr "Neispravan znak u resursu."
+#~ msgid "Ask:"
+#~ msgstr "Pitaj:"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:170
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "Click to force avatar"
+#~ msgstr "Kliknite za prisilno postavljanje avatara"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:173
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "Client:"
+#~ msgstr "Klijent:"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:177
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:180
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "Subscription:"
+#~ msgstr "Pretplata:"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:184
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Svakih %s _minuta"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:187
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "Blocked Contacts for %s"
+#~ msgstr "Blokirani Kontakti za %s"
 
-#. B means bytes
-#: ../src/common/helpers.py:190
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Uvijek ćete vidjeti njega ili nju kao nepriključenog."
 
-#: ../src/common/helpers.py:219
-msgid "_Busy"
-msgstr "_Zauzet"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s je sada %s (%s)"
 
-#: ../src/common/helpers.py:221
-msgid "Busy"
-msgstr "Zauzet"
+#~ msgid "%s is now %s"
+#~ msgstr "%s je sada %s"
 
-#: ../src/common/helpers.py:224
-msgid "_Not Available"
-msgstr "_Nedostupan"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Od: %(from_address)s"
 
-#: ../src/common/helpers.py:229
-msgid "_Free for Chat"
-msgstr "_Slobodan za razgovor"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Podrška za Upravitelja Mrežom nije dostupna"
 
-#: ../src/common/helpers.py:231
-msgid "Free for Chat"
-msgstr "Slobodan za razgovor"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)"
 
-#: ../src/common/helpers.py:234
-msgid "_Available"
-msgstr "_Dostupan"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Korištenje: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Dostupan"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s ne izgleda kao valjani JID"
 
-#: ../src/common/helpers.py:238
-msgid "Connecting"
-msgstr "Povezujem"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/helpers.py:241
-msgid "A_way"
-msgstr "O_dsutan"
+#~ msgid "_New group chat"
+#~ msgstr "_Novi grupni razgovor"
 
-#: ../src/common/helpers.py:246
-msgid "_Offline"
-msgstr "_Odspojen"
+#~ msgid "_Log on"
+#~ msgstr "_Prijava"
 
-#: ../src/common/helpers.py:248
-msgid "Offline"
-msgstr "Odspojen"
+#~ msgid "Log _off"
+#~ msgstr "_Odjava"
 
-#: ../src/common/helpers.py:251
-msgid "_Invisible"
-msgstr "_Nevidljiv"
+#~ msgid "Save passphrase"
+#~ msgstr "Sačuvati lozinku"
 
-#: ../src/common/helpers.py:257
-msgid "?contact has status:Unknown"
-msgstr "?kontakt ima status:Nepoznat"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Spusti %s u grupu %s"
 
-#: ../src/common/helpers.py:259
-msgid "?contact has status:Has errors"
-msgstr "?kontakt ima status:Ima greške"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Učini %s i %s pseudokontaktima"
 
-#: ../src/common/helpers.py:264
-msgid "?Subscription we already have:None"
-msgstr "?Pretplata koju već imamo:Ništa"
+#~ msgid "If True, autojoined bookmarked rooms will be minimized on startup."
+#~ msgstr ""
+#~ "Ako je Istinito, označene sobe kojima se automatski pristupa će biti "
+#~ "minimizirane pri pokretanju."
 
-#: ../src/common/helpers.py:266
-msgid "To"
-msgstr "Za"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Skriva gumbe u prozoru razgovora dviju osoba."
 
-#: ../src/common/helpers.py:270
-msgid "Both"
-msgstr "Oboje"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Povezan na poslužitelj %s:%s sa %s"
 
-#: ../src/common/helpers.py:278
-msgid "?Ask (for Subscription):None"
-msgstr "?Pitaj (za Pretplatu):Ništa"
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Sigurnosna greška prilikom spajanja na \"%s\""
 
-#: ../src/common/helpers.py:280
-msgid "Subscribe"
-msgstr "Pretplatite se"
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "Ključ servera se promjenio, ili netko pokušava prtljati po vašoj vezi."
 
-#: ../src/common/helpers.py:289
-msgid "?Group Chat Contact Role:None"
-msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr "Nemoguće provjeriti potpis za %s. Veza može biti nesigurna."
 
-#: ../src/common/helpers.py:292
-msgid "Moderators"
-msgstr "Moderatori"
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Nedostaje potpis u SSL vezi do %s"
 
-#: ../src/common/helpers.py:294
-msgid "Moderator"
-msgstr "Moderator"
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Potpis se ne slaže za %s: Dobiveno %s, očekivano %s"
 
-#: ../src/common/helpers.py:297
-msgid "Participants"
-msgstr "Sudionici"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d nepročitana jedna poruka"
+#~ msgstr[1] "%d nepročitanih jednih poruka"
 
-#: ../src/common/helpers.py:299
-msgid "Participant"
-msgstr "Sudionik"
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d nepročitana poruka grupnih razgovora"
+#~ msgstr[1] "%d nepročitanih poruka grupnih razgovora"
 
-#: ../src/common/helpers.py:302
-msgid "Visitors"
-msgstr "Posjetitelji"
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "Gajim - %d nepročitana privatna poruka"
+#~ msgstr[1] "%d nepročitanih privatnih poruka"
 
-#: ../src/common/helpers.py:304
-msgid "Visitor"
-msgstr "Posjetitelj"
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#: ../src/common/helpers.py:310
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
-
-#: ../src/common/helpers.py:312
-msgid "Owner"
-msgstr "Vlasnik"
-
-#: ../src/common/helpers.py:314
-msgid "Administrator"
-msgstr "Administrator"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Vezu sa domaćinom nije moguće ostvariti: Neispravan odgovor od "
+#~ "poslužitelja."
 
-#: ../src/common/helpers.py:316
-msgid "Member"
-msgstr "Član"
-
-#: ../src/common/helpers.py:355
-msgid "is paying attention to the conversation"
-msgstr "obraća pažnju na razgovor"
-
-#: ../src/common/helpers.py:357
-msgid "is doing something else"
-msgstr "radi nešto drugo"
-
-#: ../src/common/helpers.py:359
-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:362
-msgid "paused composing a message"
-msgstr "stanka pri pisanju poruke"
-
-#: ../src/common/helpers.py:364
-msgid "has closed the chat window or tab"
-msgstr "je zatvorio/zatvorila prozor za razgovor"
-
-#: ../src/common/helpers.py:894
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d nepročitana poruka"
-msgstr[1] "%d nepročitanih poruka"
-
-#: ../src/common/helpers.py:900
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d nepročitana jedna poruka"
-msgstr[1] "%d nepročitanih jednih poruka"
-
-#: ../src/common/helpers.py:906
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d nepročitana poruka grupnih razgovora"
-msgstr[1] "%d nepročitanih poruka grupnih razgovora"
-
-#: ../src/common/helpers.py:912
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d nepročitana privatna poruka"
-msgstr[1] "%d nepročitanih privatnih poruka"
-
-#: ../src/common/helpers.py:922 ../src/common/helpers.py:924
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "greška: nemogu otvoriti %s za čitanje"
-
-#: ../src/common/optparser.py:181
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:190 ../src/common/optparser.py:191
-msgid "cyan"
-msgstr "cijan"
-
-#: ../src/common/optparser.py:308
-msgid "migrating logs database to indices"
-msgstr "migriram bazu zabilješki u indekse"
-
-#: ../src/common/passwords.py:82
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim račun %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:187
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"Vezu sa domaćinom nije moguće ostvariti: Neispravan odgovor od poslužitelja."
-
-#: ../src/common/zeroconf/client_zeroconf.py:213
-msgid "Connection to host could not be established"
-msgstr "Vezu na domaćina nije moguće ostvariti"
-
-#: ../src/common/zeroconf/client_zeroconf.py:347
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Vezu sa domaćinom nije moguće ostvariti: Isteklo vrijeme za slanja podataka."
-
-#: ../src/common/zeroconf/client_zeroconf.py:640
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno "
-"spojiti."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:226
-msgid "Avahi error"
-msgstr "Avahi greška"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:226
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Poruke lokalne veze možda ne rade kako treba."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:237
-msgid "Please check if Avahi is installed."
-msgstr "Molimo provjerite da je Avahi instaliran."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:246
-#: ../src/common/zeroconf/connection_zeroconf.py:250
-msgid "Could not start local service"
-msgstr "Nije moguće pokrenuti lokalnu uslugu"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:247
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Nemoguće vezanje na port %d."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:251
-#: ../src/common/zeroconf/connection_zeroconf.py:345
-msgid "Please check if avahi-daemon is running."
-msgstr "Molimo provjerite da li je avahi-daemon pokrenut."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:344
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Nije moguće promjeniti status računa \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:361
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:373
-msgid "[This message is encrypted]"
-msgstr "[Ova poruka je kriptirana]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Greška prilikom dodavanja usluge. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Vezu na domaćina nije moguće ostvariti"
 
 #~ msgid "_Retype Password:"
 #~ msgstr "_Ponovo utipkajte Password:"
@@ -7141,8 +10009,5 @@ msgstr "Greška prilikom dodavanja usluge. %s"
 #~ msgid "_Use proxy"
 #~ msgstr "_Koristi proxy"
 
-#~ msgid "_Occupant Actions"
-#~ msgstr "_Akcije Prisutnih"
-
 #~ msgid "You must enter a password for the new account."
 #~ msgstr "Morate unesti lozinku za novi račun"
diff --git a/po/it.po b/po/it.po
index e28391be0..2fc82486b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,15 +6,11 @@
 # Andrea Ratti <scimiot@yahoo.it>, 2005.
 # Matteo Dell'Amico <della@linux.it>, 2005, 2006.
 # Daniel Coppi <neoex.dc@gmail.com>, 2007.
-#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
-#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
-#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-14 21:09+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-09-14 20:53+0100\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -36,7 +32,7 @@ msgid "Jabber IM Client"
 msgstr "Client IM Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
 msgstr "Entra in chat di _gruppo..."
 
@@ -45,7 +41,7 @@ msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
@@ -62,11 +58,16 @@ msgid "_Open Gmail Inbox"
 msgstr "_Apri posta ricevuta"
 
 #: ../data/glade/account_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:22
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Informazioni personali"
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Start Chat..."
 msgstr "_Inizia chat..."
 
-#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/account_context_menu.glade.h:9
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stato"
@@ -86,7 +87,8 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
@@ -94,64 +96,70 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Selezionare un server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Clicca per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Connettiti alla pressione di Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 #, 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:11
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Gestisci..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #: ../data/glade/account_modification_window.glade.h:40
 #: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Ricorda la pass_word"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Servizi del server"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Configura il mio profilo appena effettuata la connessione"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 #: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/porta personalizzati"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -159,46 +167,46 @@ msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Il tuo JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Hostname:"
 msgstr "Nome dell'_host: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
 #: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:31
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Nome utente:"
 
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varie</b>"
 
@@ -215,7 +223,7 @@ msgid "<b>Personal Information</b>"
 msgstr "<b>Informazioni personali</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Account"
 
@@ -224,28 +232,27 @@ msgid "Account Modification"
 msgstr "Modifica account"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Administration operations"
 msgstr "Operazioni amministrative"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:8
 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:7
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 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:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
 #: ../data/glade/account_modification_window.glade.h:10
-#: ../data/glade/accounts_window.glade.h:9
 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 "
@@ -257,60 +264,61 @@ msgstr ""
 "server la annuncia, e abilitando questa opzione TLS sarà disabilitata"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Scegli _chiave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:13
 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:12
+#: ../data/glade/accounts_window.glade.h:14
 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:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Connessione"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:471
-#: ../src/notify.py:493 ../src/notify.py:505 ../src/common/helpers.py:964
-#: ../src/common/helpers.py:976
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 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:19
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:359 ../src/roster_window.py:624
-#: ../src/roster_window.py:1360 ../src/roster_window.py:1728
-#: ../src/roster_window.py:2112 ../src/roster_window.py:2628
-#: ../src/roster_window.py:2746 ../src/common/contacts.py:309
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Generale"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome dell'host: "
 
 #: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:21
+#: ../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."
@@ -320,7 +328,7 @@ msgstr ""
 "possibilità di funzionare correttamente."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -329,7 +337,6 @@ msgstr ""
 "timeout che provoca una disconnessione"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/accounts_window.glade.h:24
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -339,7 +346,7 @@ msgstr ""
 "di lettura solo per l'utente corrente"
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -349,7 +356,7 @@ msgstr ""
 "usando questo account"
 
 #: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -360,49 +367,48 @@ msgstr ""
 "la lista contatti) cambierà anche lo stato di questo account"
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/accounts_window.glade.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:34
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1524
-#: ../src/config.py:2010
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. None means no proxy profile selected
-#. GPG Key
 #: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1110
-#: ../src/config.py:1181 ../src/config.py:1430 ../src/config.py:1435
-#: ../src/config.py:1906 ../src/config.py:1993 ../src/config.py:2009
-#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:286
-#: ../src/dialogs.py:288 ../src/roster_window.py:1832
-#: ../src/roster_window.py:1839 ../src/roster_window.py:1846
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Nessuno"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porta: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priori_tà:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -413,22 +419,21 @@ msgstr ""
 "account; il client con la maggiore priorità riceverà gli eventi"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:43
 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
-#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "_Risorsa: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -443,7 +448,6 @@ msgstr ""
 "(vedi sotto)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Salva _passphrase (non sicuro)"
@@ -467,11 +471,12 @@ msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
 
 #: ../data/glade/account_modification_window.glade.h:43
 #: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Sincronizza contatti"
 
 #: ../data/glade/account_modification_window.glade.h:44
-#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Usa _SSL (vecchio)"
 
@@ -494,27 +499,45 @@ msgstr "ID _Jabber:"
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../data/glade/accounts_window.glade.h:14
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Privacy</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Accounts"
+msgstr "Account"
+
+#: ../data/glade/accounts_window.glade.h:11
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:16
 #: ../data/glade/zeroconf_information_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
 #. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
 #: ../data/glade/xml_console_window.glade.h:4
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Nome:"
 
-#: ../data/glade/accounts_window.glade.h:27
+#: ../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
 #: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
@@ -525,45 +548,57 @@ msgstr ""
 "tue configurazioni puoi selezionarne un'altra qui.\n"
 "Potresti considerare di cambiare la configurazione del firewall"
 
-#: ../data/glade/accounts_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:453
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
 #: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Cognome:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2698
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Ri_nomina"
 
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
+
 #: ../data/glade/accounts_window.glade.h:54
 #: ../data/glade/zeroconf_properties_window.glade.h:21
 msgid "Use custom port:"
 msgstr "Usa porta personalizzata:"
 
 #: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
 msgid "gtk-close"
 msgstr "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:62
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
+
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "A_ccount:"
@@ -657,6 +692,7 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Descrizione</b>"
 
@@ -731,7 +767,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condizioni</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Suoni</b>"
 
@@ -748,7 +784,7 @@ msgid "All statuses"
 msgstr "Tutti gli stati"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:246
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Assente"
 
@@ -765,7 +801,7 @@ msgid "Have "
 msgstr "Ho "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -774,7 +810,7 @@ msgid "Launch a command"
 msgstr "Lancia un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Non disponibile"
 
@@ -899,6 +935,33 @@ msgstr "Nuova voce ricevuta"
 msgid "You have received new entry:"
 msgstr "Hai ricevuto un nuovo evento:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "Contatti bloccati"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Messaggi di stato predefiniti</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Temi</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Suoni</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Cambia password"
@@ -928,7 +991,7 @@ msgid "Join _Group Chat"
 msgstr "Entra in chat di _gruppo"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "_Aggiungi ai contatti..."
 
@@ -955,41 +1018,63 @@ msgid "_Start Chat"
 msgstr "_Inizia chat"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Clicca per vedere le conversazioni precedenti con questo contatto"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "_Gestisci contatti"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-msgid "Invite _Friends"
-msgstr "Invita _amici"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Invia _file"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
 msgstr "Attiva cifratura end-to-end"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Attiva cifratura Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "_Aggiungi ai contatti"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
-#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2567
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Cronologia"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+msgid "In_vite"
+msgstr "In_vita"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr "Invita amici!"
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+msgid "MUC server"
+msgstr "Server MUC"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr "Selezionare un server MUC."
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"Stai per iniziare una chat di gruppo.\n"
+"Scegli i contatti che vuoi invitare"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Completa nel form."
@@ -1002,6 +1087,24 @@ msgstr "Configurazione della stanza"
 msgid "Edit Groups"
 msgstr "Modifica gruppi"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descrizione</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.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
+#, fuzzy
+msgid "Features"
+msgstr "Servizi del server"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
@@ -1056,7 +1159,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -1064,7 +1167,7 @@ msgstr "_Continua"
 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:186
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Apri cartella"
 
@@ -1112,7 +1215,7 @@ msgstr "Personalizzazione temi di Gajim"
 msgid "Gone"
 msgstr "Andato via"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inattivo"
 
@@ -1161,26 +1264,22 @@ msgid "Change _Subject..."
 msgstr "Cambia _oggetto..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Clicca per vedere le conversazioni precedenti di questa stanza"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4
 msgid "Configure _Room..."
 msgstr "Configura la _stanza..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:5
+#: ../data/glade/gc_control_popup_menu.glade.h:4
 msgid "_Bookmark"
 msgstr "Aggiungi _segnalibro"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:5
 msgid "_Destroy Room"
 msgstr "_Elimina stanza"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/glade/gc_control_popup_menu.glade.h:7
 msgid "_Manage Room"
 msgstr "Gestisci stanza"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:9
+#: ../data/glade/gc_control_popup_menu.glade.h:8
 msgid "_Minimize on close"
 msgstr "_Minimizza alla chiusura"
 
@@ -1224,22 +1323,19 @@ msgstr "_Voce"
 msgid "Create new post"
 msgstr "Crea nuovo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Da"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Oggetto"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1254,78 +1350,58 @@ msgstr ""
 "esecuzione. Generalmente evita di eliminare conversazioni dei contatti con "
 "cui stai chattando."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gestore cronologia di Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Esporta"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gestore cronologia di Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Cerca nel database"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "<b>History Viewer</b>"
-msgstr "<b>Gestore cronologia</b>"
-
-#: ../data/glade/history_window.glade.h:2
-msgid "<b>JID Selection</b>"
-msgstr "<b>Selezione JID</b>"
-
-#: ../data/glade/history_window.glade.h:3
-msgid "Build custom query"
-msgstr "Costruisci richiesta personalizzata"
-
-#: ../data/glade/history_window.glade.h:4 ../src/history_window.py:199
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Cronologia conversazione"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:2
 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"
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
 msgstr ""
-"Inserisci il JID di un contatto o di una stanza di gruppo per visualizzarne "
-"la cronologia.\n"
-"Se il contatto è connesso puoi anche inserire il suo nickname.\n"
-
-#: ../data/glade/history_window.glade.h:8
-msgid "Query Builder..."
-msgstr "Costruttore richieste..."
 
-#: ../data/glade/history_window.glade.h:9
-msgid "Search"
+#: ../data/glade/history_window.glade.h:5
+#, fuzzy
+msgid "Search:"
 msgstr "Cerca"
 
-#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/history_window.glade.h:6
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../data/glade/history_window.glade.h:11 ../src/disco.py:1172
-msgid "_Search"
-msgstr "_Cerca"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Accetta"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Nega"
-
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Invito ricevuto"
-
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1265
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
@@ -1335,8 +1411,6 @@ msgstr "Entra automaticamente in questa stanza alla connessione"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Nickname:"
 
@@ -1354,8 +1428,8 @@ msgstr "Recenti:"
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1160
-#: ../src/disco.py:1615
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1391,6 +1465,21 @@ msgstr "Server:"
 msgid "Title:"
 msgstr "Titolo:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Configurazione della stanza"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Proprietà</b>"
@@ -1413,8 +1502,6 @@ msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1435,24 +1522,52 @@ msgid "_Host:"
 msgstr "_Host:"
 
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Clicca per inserire un emoticon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aggiunge il contatto alla lista"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1213
-msgid "OpenPGP Encryption"
-msgstr "Cifratura OpenPGP"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Azioni"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+msgid "Change your nickname (Ctrl+N)"
+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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:243
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Invia"
 
@@ -1469,47 +1584,73 @@ msgid "<b>Applications</b>"
 msgstr "<b>Applicazioni</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Azioni</b>"
+
+#: ../data/glade/preferences_window.glade.h:4
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Aspetto della chat</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:5
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Colori della scheda di stato chat</b>"
+
+#: ../data/glade/preferences_window.glade.h:6
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notifiche visuali</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
-msgid "<b>Format of a line</b>"
-msgstr "<b>Formato di una linea</b>"
+#: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Suoni</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
+#: ../data/glade/preferences_window.glade.h:10
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opzioni GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:13
 msgid "<b>Privacy</b>"
 msgstr "<b>Privacy</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Aspetto lista contatti</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Messaggi di stato predefiniti</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
 msgid "<b>Themes</b>"
 msgstr "<b>Temi</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notifiche visuali</b>"
 
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanzato"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1519,46 +1660,25 @@ msgstr ""
 "Solo composizione\n"
 "Disattivato"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Consentire invio di informazioni sull'_OS"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:25
 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:21
-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"
-
-#: ../data/glade/preferences_window.glade.h:22
-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 will "
-"use the default one set here"
-msgstr ""
-"Un esempio: se si ha abilitato il messaggio di stato per l'assenza, Gajim "
-"non chiederà più il messaggio di stato quando si diventa assente; verrà "
-"usato il valore predefinito impostato qui"
-
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../data/glade/preferences_window.glade.h:24
-msgid "Auto _away after:"
-msgstr "_Assente automaticamente dopo:"
-
-#: ../data/glade/preferences_window.glade.h:25
-msgid "Auto _not available after:"
-msgstr "_Non disponibile automaticamente dopo:"
-
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Rilevamento automatico ad ogni avvio di Gajim\n"
@@ -1567,55 +1687,57 @@ msgstr ""
 "Usa sempre le applicazioni predefinite XFCE4\n"
 "Personalizzate"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
-msgstr ""
-"Selezionare questa opzione solo se qualche utente fuori dalla lista contatti "
-"spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
-"messaggi ricevuti da chi non è membro della lista contatti."
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Configure color and font of the interface"
-msgstr "Configura colore e tipo di carattere per l'interfaccia"
+#, fuzzy
+msgid "Chat message:"
+msgstr "Messaggio di _stato:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "Messaggi di stato preimpostati"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Verifica sempre se Gajim è il client Jabber _predefinito all'avvio"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Configura colore e tipo di carattere per l'interfaccia"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Determinato dal mittente\n"
-"Messaggio di chat\n"
-"Messaggio singolo"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "Mostra dettagli email _extra"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#: ../data/glade/preferences_window.glade.h:45
 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:40
-msgid "Emoticons:"
-msgstr "Emoticon:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Eventi"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1625,7 +1747,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:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1635,7 +1757,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al contatto."
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1643,11 +1765,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:46
-msgid "Hides buttons in chatwindows to "
-msgstr "Nasconde i pulsanti nella finestra di chat"
+#: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
+
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1655,7 +1785,19 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:53
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1663,7 +1805,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1671,7 +1813,65 @@ 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:50
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+"nelle chat di gruppo"
+
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+"nelle chat di gruppo"
+
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+"nelle chat di gruppo"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Selezionare questa opzione solo se qualche utente fuori dalla lista contatti "
+"spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
+"messaggi ricevuti da chi non è membro della lista contatti."
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
+"nuove email"
+
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1681,7 +1881,13 @@ msgstr ""
 "(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:65
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1689,43 +1895,46 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:52
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignora la formattazione dei messaggi ricevuti"
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Log _encrypted chat session"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:68
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Rendi compatta la finestra dei _messaggi"
+
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:54
-msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
-msgstr ""
-"Mai\n"
-"Sempre\n"
-"Per account\n"
-"Per tipo"
+#: ../data/glade/preferences_window.glade.h:70
+#, fuzzy
+msgid "Notifications"
+msgstr "Demone delle notifiche"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Mostra notifica per i contatti che si _connettono"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Mostra notifica per i contatti che si _disconnettono"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Informazioni personali"
+
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1735,29 +1944,19 @@ msgstr ""
 "Mostra una notifica\n"
 "Mostra solo nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:66
-msgid "Privacy"
-msgstr "Privacy"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "Set status message to reflect currently playing _music track"
-msgstr ""
-"Imposta il messaggio di stato in modo che rifletta la traccia _musicale in "
-"riproduzione"
-
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1765,131 +1964,144 @@ msgstr ""
 "Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
 "ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Ordina i contatti per stato"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "_Icone di stato:"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "In stallo"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:74
-msgid "The auto away status message"
-msgstr "Il messaggio di stato per l'assenza automatica"
-
-#: ../data/glade/preferences_window.glade.h:75
-msgid "The auto not available status message"
-msgstr "Il messaggio di stato per il 'non disponibile' automatico"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
-msgid "Treat all incoming messages as:"
-msgstr "Trattare tutti i messaggi in arrivo come:"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Use only one message _window:"
-msgstr "Usa solo una _finestra dei messaggi:"
-
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Usa il sistema _predefinito"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Quando si riceve un nuovo evento:"
 
-#: ../data/glade/preferences_window.glade.h:81
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"Funziona con Rhythmbox e Muine. Per altri player, visita http://trac.gajim."
-"org/wiki/GajimAndMusicPlayer"
-
-#: ../data/glade/preferences_window.glade.h:82
-msgid "_Advanced Notifications Control..."
-msgstr "Controllo notifiche _avanzato..."
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "_Assente automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "Notifica dello stato di chat in _entrata:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticon:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:86
-msgid "_Font:"
-msgstr "_Carattere:"
-
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Evidenzia parole errate"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:99
 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:89
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignora la formattazione dei messaggi ricevuti"
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Messaggio in _arrivo:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_Client di posta:"
 
-#: ../data/glade/preferences_window.glade.h:92
-msgid "_Make message windows compact"
-msgstr "Rendi compatta la finestra dei _messaggi"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "_Non disponibile automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "Messaggio in _uscita:"
 
-#: ../data/glade/preferences_window.glade.h:95
-msgid "_Player:"
-msgstr "_Riproduttore:"
-
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Send chat state notifications:"
 msgstr "Notifica dello stato di chat in usci_ta:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Sort contacts by status"
-msgstr "_Ordina i contatti per stato"
-
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:100
-msgid "_URL:"
-msgstr "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Entra in chat di _gruppo"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Non nei contatti"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minuti"
 
@@ -1925,6 +2137,10 @@ msgstr "a tutti"
 msgid "Allow"
 msgstr "Permetti"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Nega"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "ID Jabber"
@@ -1933,7 +2149,7 @@ msgstr "ID Jabber"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2104
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Lista privacy"
 
@@ -1973,138 +2189,177 @@ msgstr "di inviarmi uno stato"
 msgid "to view my status"
 msgstr "di vedere il mio stato"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Aggiungi una regola</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "A proposito"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Indirizzo"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Data di nascita:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ../data/glade/vcard_information_window.glade.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:6
-msgid "Birthday:"
-msgstr "Data di nascita:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Città:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Suoni</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Clicca per inserire l'avatar"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Dipartimento:"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Società:"
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "E-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Country:"
-msgstr "Paese:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Indirizzo extra:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Department:"
-msgstr "Dipartimento:"
+#. Family Name
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Cognome:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:17
-msgid "Extra Address:"
-msgstr "Indirizzo extra:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "Nome completo"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Family:"
-msgstr "Cognome:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-GG"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Homepage:"
 
+#. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Full Name"
-msgstr "Nome completo"
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Aggiungi una regola</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Temi</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:24
-msgid "Given:"
-msgstr "Nome:"
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Nickname:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condizioni</b>"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
-msgid "Middle:"
-msgstr "Secondo nome:"
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Codice postale:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Privacy</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Personal Info"
-msgstr "Informazioni personali"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Suoni</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:35
-msgid "Phone No.:"
-msgstr "Telefono:"
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Impostazioni</b>"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Position:"
-msgstr "Titolo:"
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+#, 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
-msgid "Postal Code:"
-msgstr "Codice postale:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suoni</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
 #: ../data/glade/vcard_information_window.glade.h:39
-msgid "Prefix:"
-msgstr "Prefisso:"
+msgid "About"
+msgstr "A proposito"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
-msgid "Role:"
-msgstr "Ruolo:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:42
-msgid "State:"
-msgstr "Regione:"
+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:44
-msgid "Street:"
-msgstr "Via:"
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-GG"
 
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:48
-msgid "Suffix:"
-msgstr "Suffisso:"
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Informazioni personali"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Lavoro"
 
@@ -2120,13 +2375,10 @@ msgstr "Rimuovi l'account solo da _Gajim"
 msgid "Remove account from Gajim and from _server"
 msgstr "Rimuovi l'account da Gajim e dal _server"
 
-#. Remove
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-#: ../src/roster_window.py:2524 ../src/roster_window.py:2734
-#: ../src/roster_window.py:2870
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Elimina"
 
@@ -2148,138 +2400,188 @@ msgstr "Modifica _gruppi..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
+#. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2440
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_vita a "
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2664 ../src/roster_window.py:2798
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Elimina"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Invia s_tato personalizzato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Invia _messaggio singolo..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Invia _file..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Imposta _avatar personalizzato..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Inizia _chat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "Permetti di _vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2514 ../src/roster_window.py:2725
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Blocca"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Proibisci di vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "_Gestisci contatto"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:19
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:20
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-#: ../src/roster_window.py:2508 ../src/roster_window.py:2719
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Sblocca"
 
-#: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Account"
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "nove"
 
-#: ../data/glade/roster_window.glade.h:2
+#: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Aggiungi _contatto......"
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
 msgstr "Fun_zioni"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "_Trasferimenti file"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Domande frequenti (online)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Aiuto online"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profilo, a_vatar"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Mostra tras_porti"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Mostra lista _contatti"
+
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "Account"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Azioni"
+
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1348
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_Domande frequenti"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Send Single Message..."
 msgstr "Invia _messaggio singolo..."
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Visualizza"
 
+#: ../data/glade/search_window.glade.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
+msgid "Search"
+msgstr "Cerca"
+
+#: ../data/glade/search_window.glade.h:3
+msgid "_Add contact"
+msgstr "_Aggiungi contatto"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+msgid "_Information"
+msgstr "_Informazioni"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Cerca"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Vai"
@@ -2363,6 +2665,23 @@ msgstr "Richiesta di abbonamento"
 msgid "_Deny"
 msgstr "_Nega"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the account with which to synchronise"
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr "Sincronizzazione: scegli i contatti"
+
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
 msgstr "Disabilita suoni"
@@ -2388,55 +2707,64 @@ msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Ask:"
-msgstr "Chiedi:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Azioni</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Client:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "ID Jabber: "
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Risorsa:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Impostazioni</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrizione</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Personalizzato</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Commenti"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Configured avatar:"
 msgstr "Avatar personalizzato:"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Informazioni sul contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "More"
 msgstr "Ancora"
 
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Risorsa:"
-
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Stato:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "Subscription:"
-msgstr "Abbonamento:"
-
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "User avatar:"
 msgstr "Avatar dell'utente:"
 
@@ -2476,13 +2804,13 @@ msgstr "Assegna chiave Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:2854
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Rinomina"
 
@@ -2498,272 +2826,411 @@ msgstr "JID locale:"
 msgid "Personal"
 msgstr "Informazioni personali"
 
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Risorsa:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Stato:"
+
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Modifica account"
 
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Informazioni sul contatto"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+#, fuzzy
+msgid "Service changed the session identifier."
+msgstr "Il client a %s ha annullato la negoziazione della sessione."
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Attivato"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Disattivato"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Intero"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Colore"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nome preferenza"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valore"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Nessuna)"
 
-#. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Nascosta"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Inglese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretone"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Tedesco"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Greco"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britannico"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croato"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norvegese (b)"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brasiliano"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:283
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:306 ../src/chat_control.py:512
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:307 ../src/chat_control.py:513
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1139
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Cifratura attivata"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Non nei contatti"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "Tipo sconosciuto %s "
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#, fuzzy
+msgid "Unknown Title"
+msgstr "Tipo sconosciuto %s "
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#, fuzzy
+msgid "Unknown Source"
+msgstr "Tipo sconosciuto %s "
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" di %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s della chat di gruppo %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1227
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Cifratura disattivata"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr "La sessione SARÀ registrata"
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "La sessione NON SARÀ registrata"
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
 msgstr ""
-"%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
 
-#: ../src/chat_control.py:1266 ../src/groupchat_control.py:1411
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Usa autenticazione"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Usa autenticazione"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1273 ../src/groupchat_control.py:1434
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/chat_control.py:1276 ../src/groupchat_control.py:1448
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Utilizzo: /%s, pulisce la finestra di testo."
 
-#: ../src/chat_control.py:1279 ../src/groupchat_control.py:1453
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
 
-#: ../src/chat_control.py:1282 ../src/groupchat_control.py:1469
-#, python-format
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
 msgstr ""
 "Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/chat_control.py:1286
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Utilizzo: /%s, invia un ping al contatto"
 
-#: ../src/chat_control.py:1289
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Utilizzo: /%s, invia il messaggio al contatto"
 
-#: ../src/chat_control.py:1292 ../src/groupchat_control.py:1492
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
-#: ../src/chat_control.py:1430 ../src/chat_control.py:1456
-msgid "Encryption enabled"
-msgstr "Cifratura attivata"
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:1435
-msgid "Session WILL be logged"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Questo messaggio è cifrato]"
+
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1437
-msgid "Session WILL NOT be logged"
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:1444
-msgid "The following message was NOT encrypted"
-msgstr "Il seguente messaggio NON è stato cifrato"
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
 
-#: ../src/chat_control.py:1448 ../src/chat_control.py:1461
-#: ../src/chat_control.py:2090
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1618 ../src/conversation_textview.py:562
-#: ../src/dialogs.py:674 ../src/gajim.py:894 ../src/gajim.py:895
-#: ../src/gajim.py:1369 ../src/gajim.py:1662 ../src/roster_window.py:345
-#: ../src/roster_window.py:429 ../src/roster_window.py:1790
-#: ../src/roster_window.py:1800 ../src/roster_window.py:2039
-#: ../src/roster_window.py:2277 ../src/roster_window.py:3125
-#: ../src/roster_window.py:3351 ../src/roster_window.py:4711
-#: ../src/roster_window.py:4713 ../src/common/contacts.py:84
-#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
-msgid "Not in Roster"
-msgstr "Non nei contatti"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+msgid "The following message was NOT encrypted"
+msgstr "Il seguente messaggio NON è stato cifrato"
+
+#: ../src/chat_control.py:1854
+#, 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:1762
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:1763
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2771,24 +3238,2619 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../src/config.py:122 ../src/config.py:544
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+#, fuzzy
+msgid "Database Error"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s è ora %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "creazione database log"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s è un file ma dovrebbe essere una cartella"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim sta per uscire"
+
+#: ../src/common/check_paths.py:136
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s è una cartella ma dovrebbe essere un file"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "creazione della cartella %s"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Modifica le informazioni sullo stato"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Modifica lo stato"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Imposta tipo di presenza e descrizione"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Libero per chat"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Online"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Assente a lungo"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Non disturbare"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Offline - disconnetti"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Descrizione della presenza:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Stato modificato."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Esci dalle chat di gruppo"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s su %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Non si è entrati in una chat di gruppo."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Chat di gruppo"
+
+#: ../src/common/commands.py:247
+msgid "You left the following groupchats:"
+msgstr "Sei uscito dalle seguenti chat di gruppo:"
+
+#: ../src/common/commands.py:259
+msgid "Forward unread messages"
+msgstr "Inoltra messaggi non letti"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr "Tutti i messaggi non letti sono stati inoltrati."
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Usa D-Bus e Notification-Daemon per mostrare le notifiche"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Assente per inattività"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tempo in minuti dopo il quale lo stato diventa 'non disponibile'."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Non disponibile per inattività"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+msgid "default"
+msgstr "predefinito"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Abilità la messaggistica zeroconf sulla rete locale"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Lingua usata dal controllo ortografico"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'sempre' - scrive l'ora a ogni messaggio.\n"
+"'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
+"'mai' - non scrive mai l'ora."
+
+#: ../src/common/config.py:121
+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 ""
+"Scrive l'ora nelle chat usando l'orologio vago. Valore di vaghezza da 1 a 4, "
+"o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. "
+"Viene usato solo se print_time è 'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
+"ma senza rimuovere * *."
+
+#: ../src/common/config.py:128
+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 ""
+"Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
+"ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Carattere da aggiungere dopo il nickname quando si usa il completamento nick "
+"(tab) nella chat di gruppo."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Carattere da proporre di aggiungere dopo il nickname desiderato quando il "
+"nickname desiderato è già usato da qualcun'altro nella chat di gruppo"
+
+#: ../src/common/config.py:161
+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 ""
+"Questa opzione permette di personalizzare l'orario stampato nelle "
+"conversazioni. Per esempio, \"[%H:%M] \" mostrerà \"[ora:minuto] \". Vedere "
+"la documentazione della funzione python strftime per ottenere documentazione "
+"completa: http://docs.python.org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Caratteri scritti prima del nickname nelle conversazioni"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Caratteri scritti dopo il nickname nelle conversazioni"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Aggiungere * e [n] al titolo della lista contatti?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Quante linee ricordare dalla precedente conversazione quando una scheda/"
+"finestra di chat viene riaperta."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Quanti minuti devono durare le ultime linee dalla conversazione precedente."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
+"(comportamento predefinito del client ICQ Mirabilis)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Quante linee memorizzare per Ctrl+Alto."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
+"che significa usare wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Se Vero, resta in ascolto di segnali D-Bus dal NetworkManager e cambia lo "
+"stato dell'account (a patto che  listen_to_network_manager non sia False e "
+"che sia sincronizzato con lo stato globale) basandosi sullo stato della "
+"connessione di rete."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Le notifiche di stato mostrate nella finestra di chat. Possono essere una "
+"tra all, composing_only, disabled."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
+"scriverla ogni x minuti."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
+"questa lista separata da spazi di jid di stanze."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
+"lista separata da spazi di jid di stanze."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Lista di host separati da una virgola che saranno inviati, insieme alle "
+"interfacce locali, per il trasferimento file in caso di traslazione "
+"dell'indirizzo/inoltro porte."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Notifica gli eventi nell'area di notifica."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Mostrare scheda quando c'è una sola conversazione?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
+"registrazione dei messaggi?"
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
+"chat multi-utente."
+
+#: ../src/common/config.py:219
+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 ""
+"Se Vero, esce da Gajim quando il pulsante X del Window Manager viene "
+"cliccato. Questa impostazione è presa in considerazione solo se viene usata "
+"l'icona nello spazio di notifica."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
+"letti. A seconda del tema, questa icona può essere animata."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
+"contatto sotto il nome del contatto nella finestra dei contatti"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
+"l'ultima volta o ne ha uno troppo vecchio in cache."
+
+#: ../src/common/config.py:229
+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 ""
+"Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
+"cambia stato o messaggio di stato."
+
+#: ../src/common/config.py:230
+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 ""
+"può essere \"none\", \"all\" o \"in_and_out\". Se \"none\", Gajim non "
+"scriverà più la riga di stato nelle chat di gruppo quando un membro cambia "
+"il suo stato e/o il suo messaggio di stato. Se \"all\" Gajim scriverà tutti "
+"i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
+"entra od esce dalla chat di gruppo."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Colore di sfondo dei contatti appena collegati."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Colore di sfondo dei contatti appena scollegati."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Se Vero, i messaggi recuperati useranno un font più piccolo di quello "
+"predefinito."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Non mostrare l'avatar per il trasporto stesso."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Non mostrare l'account nella taskbar del sistema."
+
+#: ../src/common/config.py:238
+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 ""
+"Se Vero e le versioni installate di GTK+ e PyGTK sono 2.8 o superiori, la "
+"finestra lampeggia (comportamento predefinito per la maggior parte dei "
+"gestori di finestre) quando contiene nuovi eventi."
+
+#: ../src/common/config.py:240
+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 non vuole informazioni SHA quando ci si unisce ad una stanza "
+"protetta da password. Impostare a Falso per smettere di inviare informazioni "
+"SHA nella presenza sulle chat di gruppo"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Controlla la finestra dove vengono messi i nuovi messaggi.\n"
+"'always' - Tutti i messaggi vengono inviati ad una singola finestra.\n"
+"'never' - Ogni messaggio ottiene la sua finestra.\n"
+"'peracct' - I messaggi per ogni account vengono inviati ad una specifica "
+"finestra.\n"
+"'pertype' - Ogni tipo di messaggi (es., chat e chat di gruppo) viene inviato "
+"ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
+"di Gajim prima che le modifiche abbiano effetto"
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra"
+
+#: ../src/common/config.py:246
+msgid "Hides the buttons in chat windows."
+msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr ""
+"Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"In una chat, mostra il nickname all'inizio della riga solo quando non è "
+"quello della persona che parlava nel messaggio precedente."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indentazione quando si raggruppano nickname consecutivi."
+
+#: ../src/common/config.py:252
+msgid "Smooth scroll message in conversation window"
+msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Lista di colori che saranno usati per colorare i nickname nelle chat di "
+"gruppo."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
+"vuota significa che non verrà mai mostrata."
+
+#: ../src/common/config.py:256
+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 ""
+"Se Vero, si può impostare una priorità negativa all'account nella finestra "
+"di modifica account. ATTENZIONE, quando si è collegati con priorità "
+"negativa, NON si riceveranno messaggi dal server."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
+"password degli account."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
+"degli account e dei gruppi."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi "
+"in iarrivo come se fossero di questo tipo"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
+"messaggio, se la finestra di chat non è già aperta."
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
+"usando dvips e convertendola prima di inserirla in una finestra di chat."
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"Tempo di inattività richiesto prima che la finestra di cambiamento del "
+"messaggio di stato si chiuda."
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
+"più vecchie verranno cancellate."
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
+"definite nelle opzioni autopriority_*."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Workaround Jabberd2"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
+"file_transfer_proxies per il trasferimento file."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP è abilitato per questo contatto?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Linguaggio per il quale controllare le parole sbagliate"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "tutto o stati separati da uno spazio"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no', o 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' o 'both'"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Dormo"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Torno presto"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Torno tra qualche minuto."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Mangio"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Sto mangiando, lascia pure un messaggio."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Sto guardando un film."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Lavoro"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Sto lavorando."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefono"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Sono al telefono."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Fuori"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Sono fuori a divertirmi."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Sono disponibile."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Solo libero per chat."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Torno subito."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Non sono disponibile."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Non disturbare."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Ciao ciao!"
+
+#: ../src/common/config.py:441
+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 ""
+"Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
+"muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Suono da riprodurre quando un messaggio MUC arriva."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "verde"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "drogheria"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "umano"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marino"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Impossibile caricare il modulo idle"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Host errato"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr "Indirizzo locale non valido? :-O"
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"Le informazioni di registrazione per il transport %s non sono arrivate in "
+"tempo"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Dbus non è supportato."
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nickname non permesso: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Non è possibile entrare nella stanza"
+
+#: ../src/common/connection_handlers.py:2054
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Sei stato bandito dalla stanza %s."
+
+#: ../src/common/connection_handlers.py:2057
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "La stanza %s non esiste."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Non è permessa la creazione di stanze."
+
+#: ../src/common/connection_handlers.py:2063
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
+
+#: ../src/common/connection_handlers.py:2067
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+msgid "Room has been destroyed"
+msgstr "La stanza è stata cancellata"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Puoi invece entrare in questa stanza: %s"
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Vorrei aggiungerti ai miei contatti."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "si è ora abbonati a %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "richiesta di cancellazione abbonamento da %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "è stato ora cancellato l'abbonamento a %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Il JID %s non rispetta la RFC. Non verrà aggiunto ai contatti. Usare "
+"strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
+"rimuoverlo"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Non è stata impostata la passphrase OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ti connetterai a %s senza OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Impossibile caricare il modulo idle"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+#, fuzzy
+msgid "CRL is not yet valid"
+msgstr "%s non è un livello di log valido"
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Nome utente non valido"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Connessione con l'account \"%s\" persa"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Riconnetti manualmente."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+"Il server %s ha risposto in maniera errata alla richiesta di registrazione: %"
+"s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Versione D-Bus sconosciuta: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Risposta non valida"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+"Il trasporto %s ha risposto in maniera errata alla richiesta di "
+"registrazione: %s"
+
+#: ../src/common/connection.py:522
+msgid "Connection to proxy failed"
+msgstr "Connessione al proxy fallita"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Non è possibile connettersi a \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Controllare la connessione o riprovare più tardi."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Non è possibile connettersi a \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Connessione con l'account \"%s\" persa"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Versione D-Bus sconosciuta: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Controllare la connessione o riprovare più tardi"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autenticazione con \"%s\" fallita"
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Verificare la correttezza di login e password."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Errore durante la rimozione della lista privacy"
+
+#: ../src/common/connection.py:801
+#, 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 ""
+"La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
+"risorse connesse. Disattivarla e riprovare."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Oggetto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Non ottenuto a causa di stato invisibile"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Osservatori"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Trasporti"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Non nei contatti"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "I binding python per D-Bus sono mancanti su questo computer"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Il nome account non può essere vuoto."
+
+#: ../src/common/exceptions.py:55
+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
+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
+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"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "uno"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "due"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tre"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "quattro"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "cinque"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "sei"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "sette"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "otto"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "nove"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "dieci"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "undici"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "dodici"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 in punto"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "$0 e cinque"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "$0 e dieci"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "$0 e un quarto"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "$0 e venti"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "$0 e venticinque"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "$0 e mezza"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "$0 e trentacinque"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "venti alle $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "un quarto alle $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "dieci alle %1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "cinque alle $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 in punto"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Notte"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Mattino presto"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Mattino"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Quasi mezzogiorno"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Mezzogiorno"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Pomeriggio"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Sera"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Tarda sera"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Inizio della settimana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Metà settimana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Fine settimana"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Fine settimana!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Carattere non valido nel nome utente."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Indirizzo del server richiesto."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Carattere non valido nell'hostname."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Carattere non valido nella risorsa."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "O_ccupato"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Occupato"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Non disponibile"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Libero per chat"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Libero per chat"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Disponibile"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Disponibile"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Connessione in corso"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Assente"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Offline"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Offline"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Invisibile"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Sconosciuto"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Ci sono errori"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Nessuno"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "A"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Entrambi"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Nulla"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Abbonati"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "Nessuno"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderatori"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderatore"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Partecipanti"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Participante"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Visitatori"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Visitatore"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Nessuna"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Proprietario"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Amministratore"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Membro"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "sta seguendo la conversazione"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "sta facendo altro"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "sta scrivendo..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "ha smesso di scrivere"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "ha chiuso la finestra o scheda di chat"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d messaggio in attesa"
+msgstr[1] "%d messaggi in attesa"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr " dalla stanza %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr " dall'utente %s"
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr " da %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] "%d evento in attesa"
+msgstr[1] "%d eventi in attesa"
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "errore: impossibile aprire %s per lettura"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "Migrazione database delle cronologie agli indici"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Account Gajim %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "In pausa"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Grassetto"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Ho "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Chat"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Grassetto"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Contenuti"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Completato"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Contenuti"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Disattivato"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "_Precedente"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Elimina"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Disconnesso"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Disabilitato"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Disabilitato"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "_Precedente"
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Attivato"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Gruppo"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "messaggio"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Attivato"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Invisibile"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "uno"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Tedesco"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Modifica"
+
+#: ../src/common/pep.py:85
+#, fuzzy
+msgid "Nervous"
+msgstr "_Precedente"
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Gruppo"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "undici"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "In stallo"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Ultima modifica:"
+
+#: ../src/common/pep.py:98
+#, fuzzy
+msgid "Serious"
+msgstr "_Precedente"
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Nickname"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Dormo"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Via:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Abbonati"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tempo"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Sottolinea"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Host errato"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Sera"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Scrivendo"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Mattino"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "a tutti nel gruppo"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Lavoro"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Sera"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Sto cacciando %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Entra"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Lavoro"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Lavoro"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "stanza"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Mangio"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Cambio oggetto"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Sto cacciando %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Mangio"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Lavoro"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "semplice"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Sto cacciando %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Mangio"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Disconnessione"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Mangio"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Motivo"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Motivo"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Dormo"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Lavoro"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Mangio"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Sto guardando un film."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Mangio"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Sono al telefono."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Trasferimento in corso"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Scrivendo"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Online"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Apri come _Link"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Lavoro"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Scrivendo"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Lavoro"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Non è possibile fare il bind alla porta %s"
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Potrebbe essere in esecuzione un altra istanza di Gajim. Il trasferimento "
+"file verrà annullato."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"La connessione all'host non può esser stabilita: Tempo scaduto durante "
+"l'invio di dati."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
+"valida, perciò sarà ignorato."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Errore avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"La messaggistica sulla rete locale potrebbe non funzionare correttamente."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Controllare se Avahi è installato."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Impossibile avviare il servizio locale"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossibile collegarsi alla porta %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Controllare se avahi-daemon è in esecuzione."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Tu non sei connesso o non sei visibile ad altri. Il tuo messaggio non può "
+"essere inviato."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Questo messaggio è cifrato]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Errore durante la creazione del servizio. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:288
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:296
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:617 ../src/dialogs.py:958
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Messaggi di stato preimpostati"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Abilita"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizzato</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:618
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2797,256 +5859,258 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:969
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:969
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:1005
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:1006
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Prossimo messaggio ricevuto"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:1007
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:1008
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:1010
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:1018
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
 #. Name column
-#: ../src/config.py:1287 ../src/dialogs.py:1397 ../src/dialogs.py:1461
-#: ../src/disco.py:736 ../src/disco.py:1559 ../src/disco.py:1805
-#: ../src/history_window.py:108
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1395 ../src/common/config.py:375
-msgid "Be right back."
-msgstr "Torno subito."
-
-#: ../src/config.py:1399
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1406
 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:1495 ../src/config.py:1594
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1630 ../src/config.py:1674
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1631
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
 
-#: ../src/config.py:1660
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1694
 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:1670
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1671
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1675
+#: ../src/config.py:1710
 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:1681
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1682
+#: ../src/config.py:1717
 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:1686 ../src/config.py:1690
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1687
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1691
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1755
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:1756
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:1774 ../src/config.py:1782 ../src/config.py:1822
-#: ../src/config.py:3048
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1783
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1968 ../src/config.py:3119
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1969 ../src/config.py:3120
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1990
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1994
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:1995
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2052
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2089
 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:2060 ../src/dialogs.py:1244 ../src/dialogs.py:1385
-#: ../src/dialogs.py:1565 ../src/disco.py:420 ../src/profile_window.py:325
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:2061
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2066
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2097
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2098
+#: ../src/config.py:2134
 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:2274
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2276
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2312
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2364 ../src/disco.py:743 ../src/history_manager.py:155
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2372
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2381
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2406
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2408
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -3054,11 +6118,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -3066,11 +6130,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -3078,11 +6142,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2417
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -3090,7 +6154,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2418
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3107,85 +6171,85 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2522
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2539 ../src/gajim.py:1312 ../src/roster_window.py:3410
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2540 ../src/roster_window.py:3406
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2541 ../src/roster_window.py:3411
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2556
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2649
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:2651
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2754
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
 
-#: ../src/config.py:3031
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3033
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "ID Jabber duplicato"
 
-#: ../src/config.py:3060
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Questo account è già configurato in Gajim."
 
-#: ../src/config.py:3077
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3078 ../src/config.py:3223
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3195,223 +6259,291 @@ msgstr ""
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3095
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3202 ../src/config.py:3241
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Contatto già presente nella lista contatti"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3222
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3327
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3328
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:337
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 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:409
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:421
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:426
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:442
+#: ../src/conversation_textview.py:712
 #, 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:455
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:458
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:464
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
-#: ../src/conversation_textview.py:929
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:933
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:967
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dialogs.py:64
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Client IM Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:66
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID Jabber: <i>%s</i>"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:223
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:323
+#: ../src/dialogs.py:461
+msgid "Set Mood"
+msgstr ""
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:325
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:425
-msgid "Save as Preset Status Message"
-msgstr "Salva come messaggio di stato predefinito"
-
-#: ../src/dialogs.py:426
-msgid "Please type a name for this status message"
-msgstr "Inserire un nome per questo messaggio di stato"
-
-#: ../src/dialogs.py:437
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere messaggio di stato?"
 
-#: ../src/dialogs.py:438
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
 "stato?"
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:682
+msgid "Save as Preset Status Message"
+msgstr "Salva come messaggio di stato predefinito"
+
+#: ../src/dialogs.py:683
+msgid "Please type a name for this status message"
+msgstr "Inserire un nome per questo messaggio di stato"
+
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:456
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:458
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:495
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:497
+#: ../src/dialogs.py:731
 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:654 ../src/dialogs.py:660
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:661
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Vorrei aggiungerti ai miei contatti."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:676
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:775
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:776
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:790
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:792
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:1035
 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:821
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -3419,20 +6551,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:951
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Non è possibile fare il bind alla porta %s"
-
-#: ../src/dialogs.py:952
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Potrebbe essere in esecuzione un altra istanza di Gajim. Il trasferimento "
-"file verrà annullato."
-
-#: ../src/dialogs.py:959
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -3445,365 +6564,467 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1173
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, 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:1176
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:1237 ../src/roster_window.py:763
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:1245
+#: ../src/dialogs.py:1686
 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:1263
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
-#: ../src/groupchat_control.py:1662
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Nickname non valido"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+msgid "The nickname has not allowed characters."
+msgstr "Il nickname contiene caratteri non consentiti."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1334 ../src/dialogs.py:1340
-#: ../src/groupchat_control.py:1663
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 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:1346
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:1347
+#: ../src/dialogs.py:1795
 #, 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:1386
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1433
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:1434
+#: ../src/dialogs.py:1870
 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:1458
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:1516
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:1518
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:1519
+#: ../src/dialogs.py:1955
 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:1544 ../src/dialogs.py:1891 ../src/dialogs.py:2027
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:1545 ../src/dialogs.py:1892 ../src/dialogs.py:2028
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:1554 ../src/dialogs.py:1557
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1557
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:1566
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:1584
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:1590
+#: ../src/dialogs.py:2025
 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:1632 ../src/notify.py:219 ../src/notify.py:429
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:1634 ../src/notify.py:227 ../src/notify.py:431
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:1636 ../src/notify.py:250 ../src/notify.py:433
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:1636 ../src/notify.py:231 ../src/notify.py:433
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:1637 ../src/notify.py:238 ../src/notify.py:434
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:1637 ../src/gajim.py:1465 ../src/notify.py:442
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:1639 ../src/gajim.py:1682 ../src/notify.py:436
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:1641 ../src/gajim.py:1437 ../src/gajim.py:1649
-#: ../src/notify.py:438
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:1643 ../src/gajim.py:1721 ../src/gajim.py:1743
-#: ../src/gajim.py:1760 ../src/notify.py:440
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:1644 ../src/gajim.py:1724 ../src/notify.py:440
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:1646 ../src/gajim.py:1333 ../src/notify.py:444
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:1648 ../src/notify.py:211 ../src/notify.py:446
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:1821
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1823
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1828
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1928
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1929
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1973
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1975
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2098
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2102
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:2158
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, 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:2161
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:2203
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:2458
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:2459
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Non si è entrati in una chat di gruppo."
+
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2968
 #, 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"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2978
+#, fuzzy
+msgid "Do you want to accept the invitation?"
+msgstr "Vuoi inviare questo file a %s:"
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:2586 ../src/dialogs.py:2634
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:2591
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:2639
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:2705
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
 #. # means number
-#: ../src/dialogs.py:2776
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2782
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:2900
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/disco.py:104
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+#, fuzzy
+msgid "Have you verified the contact's identity?"
+msgstr "Verifica l'identità del client remoto"
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Altri"
 
-#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1345
-#: ../src/gajim.py:644 ../src/roster_window.py:282 ../src/roster_window.py:342
-#: ../src/roster_window.py:382 ../src/roster_window.py:490
-#: ../src/roster_window.py:522 ../src/roster_window.py:524
-#: ../src/roster_window.py:4707 ../src/roster_window.py:4709
-#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
-#: ../src/common/helpers.py:44
-msgid "Transports"
-msgstr "Trasporti"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:108
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:495
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3811,183 +7032,452 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:662
 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:723
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Server non valido"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1142
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Esegui comando"
 
-#: ../src/disco.py:1152 ../src/disco.py:1350
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1387
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1569
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1577
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1585
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1814
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:1822
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1879
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:1885
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:1891
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr "PyOpenSSL"
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Una libreria usata per validare i certificati del server per assicurare una "
+"connessione sicura."
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr "Richiede python-pyopenssl."
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr "Bonjour/Zeroconf"
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+"Sistema di chat senza server con i client rilevati automaticamente nella "
+"rete locale."
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr "Richiede python-avahi."
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr "gajim-remote"
+
+#: ../src/features_window.py:60
+#, fuzzy
+msgid "A script to control Gajim via commandline."
+msgstr "Uno script per controllare gajim dalla riga di comando."
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr "Richiede python-dbus."
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr "Caratteristica non disponibile sotto Windows."
+
+#: ../src/features_window.py:63
+msgid "OpenGPG"
+msgstr "OpenGPG"
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr "Cifratura dei messaggi di chat con le chiavi gpg."
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr "Richiede gpg e python-GnuPGInterface"
+
+#: ../src/features_window.py:67
+msgid "network-manager"
+msgstr "Gestore connessione"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr "Riconoscimento automatico dello stato della connessione."
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr "Richiede gnome-network-manager e python-dbus."
+
+#: ../src/features_window.py:71
+msgid "Session Management"
+msgstr "Gestore sessioni"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+"La sessione di Gajim viene salvata alla chiusura e ripristinata all'avvio."
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr "Richiede python-gnome2."
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr "Gestore portachiavi"
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+"Le password possono essere salvate in modo sicuro e non in un semplice file "
+"di testo."
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Richiede gnome-keyring e python-gnome2-desktop."
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr "SRV"
+
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Ability to connect to servers which are using SRV records."
+msgstr "Possibilità di connettersi ai server che usano record SRV."
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr "Richiede dnsutils."
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr "Richiede nslookup per usare i record SRV."
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr "Correttore ortografico"
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr "Correzione ortografica dei messaggi."
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+"Richiede python-gnome2-extras o la compilazione del modulo gtkspell dai "
+"sorgenti di Gajim."
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr "Demone delle notifiche"
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr "Popup passivi che notificano nuovi eventi."
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr "Richiede python-notify, oppure python-dbus e notification-daemon."
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr "Icona nell'area di notifica"
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
+
+#: ../src/features_window.py:93
+#, fuzzy
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+"Richiede python-gnome2-extras oppure la compilazione del modulo trayicon dai "
+"sorgenti di Gajim."
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr "Richiede PyGTK >= 2.10."
+
+#: ../src/features_window.py:95
+msgid "Idle"
+msgstr "Inattivatore"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+"Possibilità di misurare il tempo di inattività, per poter cambiare lo stato "
+"automaticamente."
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr "Richiede la compilazione del modulo idle dai sorgenti di Gajim."
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../src/features_window.py:100
+#, fuzzy
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
+
+#: ../src/features_window.py:101
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
+"su Attivato nell'Editor di configurazione avanzata."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
+"su Attivato nell'Editor di configurazione avanzata."
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Attiva cifratura end-to-end"
+
+#: ../src/features_window.py:104
+msgid "Encrypting chatmessages."
+msgstr "Cifratura dei messaggi di chat."
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr "Richiede python-crypto."
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Generatore RST"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Genera output XHTML a partire da codice RST (vedi http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr "Richiede python-docutils."
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+#, fuzzy
+msgid "Requires python-sexy."
+msgstr "Richiede python-dbus."
+
+#: ../src/features_window.py:128
+msgid "Feature"
+msgstr "Funzione"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:169 ../src/filetransfers_window.py:179
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:170
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:182
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
-#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "La connessione non può essere stabilita."
 
-#: ../src/filetransfers_window.py:214
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Trasferimento file fermato dal contatto dall'altra parte"
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Descrizione: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:254
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:769
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3995,31 +7485,33 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
-#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:784
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
-#: ../src/filetransfers_window.py:338
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Salva file come..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:419
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -4027,66 +7519,66 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:508
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:551
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:763
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s non è un livello di log valido"
 
-#: ../src/gajim.py:143
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:147
+#: ../src/gajim.py:186
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.8 o superiore"
 
-#: ../src/gajim.py:148
+#: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Gajim ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:150
+#: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim ha bisogno di GTK2.8 o superiore"
 
-#: ../src/gajim.py:151
+#: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim ha bisogno di GTK2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:156
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:158
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -4095,20 +7587,20 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:160
+#: ../src/gajim.py:199
 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:165
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di pywin32 per essere eseguito"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -4118,11 +7610,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:317
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:318
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -4130,350 +7622,443 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim.py:341 ../src/common/connection_handlers.py:896
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1626
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1655
-#: ../src/common/connection_handlers.py:1892
-#: ../src/common/connection_handlers.py:2004 ../src/common/connection.py:925
-msgid "Disk Write Error"
-msgstr "Errore di scrittura su disco"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Passphrase richiesta"
+
+#: ../src/gajim.py:494
+#, 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."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Passphrase errata"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Riscrivere la passphrase GPG o premere Annulla."
+
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Il nickname desiderato è in uso o registrato da un altro partecipante alla "
+"chat di gruppo %s.\n"
+"Specificare un altro nickname sotto:"
 
-#: ../src/gajim.py:434
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:437
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Accettare questa richiesta?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:484 ../src/notify.py:448
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gajim.py:817
-#, python-format
-msgid "Subject: %s"
-msgstr "Oggetto: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:864 ../src/gajim.py:877
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gajim.py:910
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:911
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: ../src/gajim.py:919
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:920
-msgid "You will always see him or her as offline."
-msgstr "Lo vedrai sempre come offline."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:964
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:965 ../src/common/connection.py:466
-msgid "Check your connection or try again later."
-msgstr "Controllare la connessione o riprovare più tardi."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s è ora conosciuto come %s"
 
-#: ../src/gajim.py:1136 ../src/roster_window.py:1348
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s è ora %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s è ora %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1139 ../src/groupchat_control.py:1120
-#: ../src/roster_window.py:1351
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s è ora %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1260 ../src/groupchat_control.py:932
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
-#: ../src/gajim.py:1263
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: ../src/gajim.py:1265
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "la stanza ora non mostra i membri non disponibili"
 
-#: ../src/gajim.py:1268
+#: ../src/gajim.py:1377
 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_contol.py)
-#: ../src/gajim.py:1271
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/gajim.py:1273
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "La registrazione dei messaggi della stanza è stata disattivata"
 
-#: ../src/gajim.py:1275
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: ../src/gajim.py:1278
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: ../src/gajim.py:1281
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "La stanza è ora completamente anonima"
 
-#: ../src/gajim.py:1313
-#, python-format
-msgid "A Password is required to join the room %s. Please type it"
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "È necessaria una password per entrare nella stanza %s. Inserisci la password"
 
-#: ../src/gajim.py:1343
-msgid "Your passphrase is incorrect"
-msgstr "Passphrase errata"
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
 
-#: ../src/gajim.py:1344
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Passphrase errata"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1450
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Da: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1679
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1744
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s ricevuto con successo da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1748
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/gajim.py:1761
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
 
 #. ft stopped
-#: ../src/gajim.py:1765
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gajim.py:1860
-msgid "Session negotiation cancelled"
-msgstr "Negoziazione della sessione annullata"
-
-#: ../src/gajim.py:1861
-#, python-format
-msgid "The client at %s cancelled the session negotiation."
-msgstr "Il client a %s ha annullato la negoziazione della sessione."
-
-#: ../src/gajim.py:1901 ../src/gajim.py:1942
-msgid "Confirm these session options"
-msgstr "Conferma queste opzioni di sessione"
-
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
-"\n"
-"\t%s\n"
-"\n"
-"\tAre these options acceptable?"
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
 msgstr ""
-"Il client remoto vuole negoziare una sessione con queste caratteristiche:\n"
-"\n"
-"\t%s\n"
-"\n"
-"\tQueste opzioni sono accettabili?"
 
-#: ../src/gajim.py:1943
-#, python-format
-msgid ""
-"The remote client selected these options:\n"
-"\n"
-"%s\n"
-"\n"
-"Continue with the session?"
-msgstr ""
-"Il client remoto ha selezionato queste opzioni:\n"
-"\n"
-"%s\n"
-"\n"
-"Continuare la sessione?"
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "In tutti i _messaggi"
 
-#: ../src/gajim.py:2055
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gajim.py:2056
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2081
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2087
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Errore."
 
-#: ../src/gajim.py:2112
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: ../src/gajim.py:2113
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Connessione"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Stai per creare un metacontatto. Continuare?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Non chiederlo più"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Cifratura disattivata"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2475
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#. sorted alphanum
-#: ../src/gajim.py:2610 ../src/common/config.py:86 ../src/common/config.py:395
-#: ../src/common/optparser.py:194 ../src/common/optparser.py:412
-#: ../src/common/optparser.py:446
-msgid "default"
-msgstr "predefinito"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Segnalibro già impostato"
 
-#: ../src/gajim.py:2697
-msgid "Network Manager support not available"
-msgstr "Supporto Network Manager non disponibile"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/gajim.py:2798
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
+"della lista contatti."
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Mostra un aiuto su di un comando specifico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Cambia lo stato degli account"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "messaggio"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4482,20 +8067,20 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:128
 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 "
@@ -4505,30 +8090,30 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "chiave pgp"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà cifrato usando questa chiave pubblica"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141
 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 "
@@ -4538,138 +8123,138 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "oggetto"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Invia nuovi messaggi alla chat di gruppo in cui sei entrato."
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
-#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:205
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Apre la finestra di inizio chat"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Inizia chat usando questo account"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Invia XML personalizzato"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4677,35 +8262,74 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Gestisci un uri xmpp:/"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+#, fuzzy
+msgid "Account in which you want to handle it"
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "stanza"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Stanza:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Nickname non trovato: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Le password non coincidono"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Account from which you want to enter the room"
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Controllare se avahi-daemon è in esecuzione."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Mostra o nascondi la lista contatti"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4714,29 +8338,31 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:299
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:363
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Utilizzo: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:370
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:374
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4745,178 +8371,197 @@ msgstr ""
 "Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:447
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:451
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:469
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "URI errato"
 
-#: ../src/gajim_themes_window.py:62
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
-#: ../src/gajim_themes_window.py:100
+#: ../src/gajim_themes_window.py:97
 msgid "You cannot make changes to the default theme"
 msgstr "Non è possibile modificare il tema di default"
 
-#: ../src/gajim_themes_window.py:101
+#: ../src/gajim_themes_window.py:98
 msgid "Please create a clean new theme with your desired name."
 msgstr "Creare un nuovo tema con il nome desiderato."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:175
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "nome del tema"
 
-#: ../src/gajim_themes_window.py:192
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Non è possibile eliminare il tema corrente"
 
-#: ../src/gajim_themes_window.py:193
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:134
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:136
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:343
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:859
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Cronologia conversazione"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Connessione"
+
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:935
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:940
+#: ../src/groupchat_control.py:1132
 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:946
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:1142
 #, 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:957
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:961
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
 
-#. Someone changed his or her nick
-#. We changed our nick
-#: ../src/groupchat_control.py:968
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:970
-#, python-format
-msgid "%s is now known as %s"
-msgstr "%s è ora conosciuto come %s"
-
-#: ../src/groupchat_control.py:1003 ../src/groupchat_control.py:1007
-#: ../src/groupchat_control.py:1012
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1004
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1009
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1014
+#: ../src/groupchat_control.py:1211
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1113
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s è stato cacciato: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1118
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1231 ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Nickname non valido"
 
-#: ../src/groupchat_control.py:1232 ../src/groupchat_control.py:1511
-msgid "The nickname has not allowed characters."
-msgstr "Il nickname contiene caratteri non consentiti."
-
-#: ../src/groupchat_control.py:1255 ../src/groupchat_control.py:1273
-#: ../src/groupchat_control.py:1357 ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Questa stanza non ha oggetto"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4929,7 +8574,7 @@ msgstr ""
 "contiene \"@\". Se il JID è correntemente nella stanza, verrà anche "
 "cacciato. NON supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1444
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4938,7 +8583,7 @@ msgstr ""
 "Utilizzo: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1450
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4947,7 +8592,7 @@ msgstr ""
 "Utilizzo: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1456
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4956,7 +8601,7 @@ msgstr ""
 "Utilizzo: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1460
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4965,7 +8610,7 @@ msgstr ""
 "Utilizzo: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare "
 "in stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1464
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4976,7 +8621,7 @@ msgstr ""
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1473
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4985,27 +8630,27 @@ msgstr ""
 "Utilizzo: /%s <nickname> [messaggio], apre una finestra di messaggi privati "
 "ed invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_control.py:1478
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
 
-#: ../src/groupchat_control.py:1482
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
 "corrente."
 
-#: ../src/groupchat_control.py:1486
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
 "corrente."
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -5013,43 +8658,39 @@ msgstr ""
 "Utilizzo: /%s <messaggio>, invia un messaggio senza considerare gli altri "
 "comandi."
 
-#: ../src/groupchat_control.py:1584
+#: ../src/groupchat_control.py:1837
 #, 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:1586
+#: ../src/groupchat_control.py:1839
 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:1590 ../src/roster_window.py:4855
-msgid "Do _not ask me again"
-msgstr "_Non chiederlo più"
-
-#: ../src/groupchat_control.py:1624
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1625
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1634
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1635
+#: ../src/groupchat_control.py:1882
 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:1650
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1651
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -5057,50 +8698,31 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1653
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
-#: ../src/groupchat_control.py:1684
-msgid "Bookmark already set"
-msgstr "Segnalibro già impostato"
-
-#: ../src/groupchat_control.py:1685
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "La stanza \"%s\" è già tra i segnalibri."
-
-#: ../src/groupchat_control.py:1694
-msgid "Bookmark has been added successfully"
-msgstr "Il segnalibro è stato aggiunto con successo"
-
-#: ../src/groupchat_control.py:1695
-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."
-
 #. ask for reason
-#: ../src/groupchat_control.py:1847
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1848 ../src/groupchat_control.py:2148
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2147
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "È stato individuato un errore di programmazione"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -5108,98 +8730,98 @@ msgstr ""
 "Probabilmente non è fatale, ma dovrebbe comunque venire segnalato agli "
 "sviluppatori."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Segnala bug"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Dettagli"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:157 ../src/gtkgui_helpers.py:172
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:337
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:340
+#: ../src/gtkgui_helpers.py:359
 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:377
+#: ../src/gtkgui_helpers.py:396
 #, 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:711
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:712
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../src/gtkgui_helpers.py:713
+#: ../src/gtkgui_helpers.py:735
 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:812
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:813
+#: ../src/gtkgui_helpers.py:805
 #, 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:822
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
-#: ../src/history_manager.py:68
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Contatti"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:116
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:124
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:224
 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:189
+#: ../src/history_manager.py:226
 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 "
@@ -5213,16 +8835,16 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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] ""
@@ -5230,150 +8852,158 @@ msgstr[0] ""
 msgstr[1] ""
 "Si vuole davvero eliminare la cronologia per i contatti selezionati?"
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vogliono davvero eliminare i messaggi selezionati?"
 
-#: ../src/history_window.py:185 ../src/history_window.py:187
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
 #: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:336 ../src/notify.py:206
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s è ora %(status)s"
-
-#: ../src/history_window.py:342
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:345
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/htmltextview.py:604
+#: ../src/htmltextview.py:612
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: ../src/message_window.py:288
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:290
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:292
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:294
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/message_window.py:295
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr "- i messaggi saranno registrati"
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr "- i messaggi non saranno registrati"
 
-#: ../src/notify.py:204
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s connesso"
 
-#: ../src/notify.py:222
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s disconnesso"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuovo messaggio privato dalla stanza %s"
 
-#: ../src/notify.py:244
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:247
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaggio inviato da %(nickname)s"
 
-#: ../src/notify.py:253
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Generale"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:123 ../src/roster_window.py:1882
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:126 ../src/roster_window.py:1885
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:140 ../src/profile_window.py:156
-#: ../src/roster_window.py:1887 ../src/roster_window.py:1898
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:257
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informazioni ricevute"
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/profile_window.py:338
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Invio del profilo..."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: ../src/profile_window.py:360
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:361
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -5381,93 +9011,89 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:182 ../src/roster_window.py:237
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:357 ../src/roster_window.py:622
-#: ../src/roster_window.py:2110 ../src/common/contacts.py:307
-#: ../src/common/helpers.py:44
-msgid "Observers"
-msgstr "Osservatori"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Autorizzazione inviata"
 
-#. Make special context menu if group is Groupchats
-#: ../src/roster_window.py:441 ../src/roster_window.py:446
-#: ../src/roster_window.py:1935 ../src/roster_window.py:1938
-#: ../src/roster_window.py:2607 ../src/roster_window.py:2610
-#: ../src/roster_window.py:2635 ../src/roster_window.py:4715
-#: ../src/roster_window.py:4717 ../src/common/commands.py:194
-#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
-msgid "Groupchats"
-msgstr "Chat di gruppo"
+#: ../src/roster_window.py:1861
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:771 ../src/roster_window.py:3971
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "La richiesta di abbonamento è stata inviata"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py:984 ../src/roster_window.py:994
-#: ../src/roster_window.py:1003 ../src/systray.py:207 ../src/systray.py:212
-#: ../src/systray.py:218
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using account %s"
-msgstr "usando l'account %s"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#. add
-#: ../src/roster_window.py:1010
-#, python-format
-msgid "to %s account"
-msgstr "all'account %s"
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "L'autorizzazione è stata rimossa"
 
-#. disco
-#: ../src/roster_window.py:1015
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "using %s account"
-msgstr "usando l'account %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1096
-msgid "_Manage Bookmarks..."
-msgstr "_Gestione segnalibri..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring è installato ma non avviato correttamente (la variabile "
+"d'ambiente è probabilmente impostata in maniera non corretta)"
 
-#. profile, avatar
-#: ../src/roster_window.py:1115
-#, python-format
-msgid "of account %s"
-msgstr "dell'account %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:1155
-#, python-format
-msgid "for account %s"
-msgstr "per l'account %s"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Si sta partecipando ad una o più chat di gruppo"
 
-#. History manager
-#: ../src/roster_window.py:1176
-msgid "History Manager"
-msgstr "Gestore cronologia"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Impostare lo stato invisibile ti farà disconnettere da queste chat di "
+"gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:1185
-msgid "_Join New Group Chat"
-msgstr "_Nuova chat di gruppo"
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1544 ../src/roster_window.py:4169
-#: ../src/roster_window.py:4176
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"I messaggi saranno disponibili per una lettura successiva solo se la "
+"cronologia è abilitata"
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:1548
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:1549
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5475,168 +9101,66 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:1552
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:1557
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1723
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:1724
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:1732
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:1807
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:1808
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:1809
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, 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:1840
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:1841
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:2156
-msgid "_New Group Chat"
-msgstr "_Nuova chat di gruppo"
-
-#: ../src/roster_window.py:2298
-msgid "I would like to add you to my roster"
-msgstr "Vorrei aggiungerti ai miei contatti"
-
-#. Send Group Message
-#: ../src/roster_window.py:2432 ../src/roster_window.py:2644
-msgid "Send Group M_essage"
-msgstr "Invia _messaggio di gruppo"
-
-#: ../src/roster_window.py:2451
-msgid "_New group chat"
-msgstr "_Nuova chat di gruppo"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:2489
-msgid "_Manage Contacts"
-msgstr "_Gestisci contatti"
-
-#: ../src/roster_window.py:2550
-msgid "_Maximize"
-msgstr "_Massimizza"
-
-#: ../src/roster_window.py:2557
-msgid "_Disconnect"
-msgstr "_Disconnetti"
-
-#: ../src/roster_window.py:2636
-msgid "_Maximize All"
-msgstr "_Massimizza tutti"
-
-#: ../src/roster_window.py:2652
-msgid "To all users"
-msgstr "A tutti gli utenti"
-
-#: ../src/roster_window.py:2655
-msgid "To all online users"
-msgstr "Utenti _online"
-
-#. Log Off
-#: ../src/roster_window.py:2772
-msgid "_Log off"
-msgstr "_Disconnetti"
-
-#. Log on
-#: ../src/roster_window.py:2778
-msgid "_Log on"
-msgstr "_Connetti"
-
-#. Send single message
-#: ../src/roster_window.py:2790
-msgid "Send Single Message"
-msgstr "Invia messaggio singolo"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:2837
-msgid "_Manage Transport"
-msgstr "_Gestisci trasporto"
-
-#. Modify Transport
-#: ../src/roster_window.py:2845
-msgid "_Modify Transport"
-msgstr "_Modifica trasporto"
-
-#. Information
-#: ../src/roster_window.py:2882
-msgid "_Information"
-msgstr "_Informazioni"
-
-#: ../src/roster_window.py:2959 ../src/roster_window.py:3033
-msgid "_Change Status Message"
-msgstr "_Cambia messaggio di stato"
-
-#: ../src/roster_window.py:3105
-msgid "Authorization has been sent"
-msgstr "Autorizzazione inviata"
-
-#: ../src/roster_window.py:3106
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Ora \"%s\" conoscerà il tuo stato."
-
-#: ../src/roster_window.py:3126
-msgid "Subscription request has been sent"
-msgstr "La richiesta di abbonamento è stata inviata"
-
-#: ../src/roster_window.py:3127
-#, 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:3139
-msgid "Authorization has been removed"
-msgstr "L'autorizzazione è stata rimossa"
-
-#: ../src/roster_window.py:3140
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Ora \"%s\" ti vedrà sempre come offline."
-
-#: ../src/roster_window.py:3357
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3361
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5644,7 +9168,13 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione. Questi "
 "ti vedrà sempre offline."
 
-#: ../src/roster_window.py:3366
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Cosa fare?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5652,16 +9182,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3369
+#: ../src/roster_window.py:3144
 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:3373
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3377
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5670,85 +9200,20 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3409
-msgid ""
-"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/roster_window.py:3436
-msgid "GPG is not usable"
-msgstr "Non è possibile utilizzare GPG"
-
-#. %s is the account name here
-#: ../src/roster_window.py:3436 ../src/common/connection.py:684
-#: ../src/common/zeroconf/connection_zeroconf.py:165
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ti connetterai a %s senza OpenPGP."
-
-#: ../src/roster_window.py:3453
-msgid "Passphrase Required"
-msgstr "Passphrase richiesta"
-
-#: ../src/roster_window.py:3454
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Inserire la passphrase della chiave GPG per l'account %s."
-
-#: ../src/roster_window.py:3459
-msgid "Save passphrase"
-msgstr "Memorizza passphrase"
-
-#: ../src/roster_window.py:3467
-msgid "Wrong Passphrase"
-msgstr "Passphrase errata"
-
-#: ../src/roster_window.py:3468
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Riscrivere la passphrase GPG o premere Annulla."
-
-#: ../src/roster_window.py:3551 ../src/roster_window.py:3628
-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:3552 ../src/roster_window.py:3629
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"Impostare lo stato invisibile ti farà disconnettere da queste chat di "
-"gruppo. Diventare veramente invisibile?"
-
-#: ../src/roster_window.py:3586
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3587
+#: ../src/roster_window.py:3192
 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:3715
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" di %(artist)s"
-
-#: ../src/roster_window.py:4170 ../src/roster_window.py:4177
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"I messaggi saranno disponibili per una lettura successiva solo se la "
-"cronologia è abilitata"
-
-#: ../src/roster_window.py:4801
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:4803
+#: ../src/roster_window.py:3710
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -5757,12 +9222,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:4849
+#: ../src/roster_window.py:3784
 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:4851
+#: ../src/roster_window.py:3786
 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 "
@@ -5772,123 +9237,324 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4949
-#, python-format
-msgid "Do you want to send that file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "File non valido"
+
+#: ../src/roster_window.py:3910
+#, 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:5232
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "usando l'account %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "all'account %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "usando l'account %s"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Gestione segnalibri..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "dell'account %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "per l'account %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Cambia messaggio di stato"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Pubblica"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Attivo"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "Configura la _stanza..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr "_Massimizza tutti"
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Invia _messaggio di gruppo"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "A tutti gli utenti"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Utenti _online"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Vorrei aggiungerti ai miei contatti"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+msgid "_Manage Contacts"
+msgstr "_Gestisci contatti"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+msgid "Send Single Message"
+msgstr "Invia messaggio singolo"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+msgid "_Manage Transport"
+msgstr "_Gestisci trasporto"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+msgid "_Modify Transport"
+msgstr "_Modifica trasporto"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr "_Massimizza"
+
+#: ../src/roster_window.py:5795
+msgid "_Disconnect"
+msgstr "_Disconnetti"
+
+#: ../src/roster_window.py:5875
+msgid "_New Group Chat"
+msgstr "_Nuova chat di gruppo"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Gestore cronologia"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Nuova chat di gruppo"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/systray.py:164
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr "Ricerca in corso"
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr "Errore nella ricezione dei dati"
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr "Nessun risultato"
+
+#: ../src/session.py:124
+#, fuzzy
+msgid "Disk WriteError"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Oggetto: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr "Conferma queste opzioni di sessione"
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+"Il client remoto vuole negoziare una sessione con queste caratteristiche:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tQueste opzioni sono accettabili?"
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+"Il client remoto ha selezionato queste opzioni:\n"
+"\n"
+"%s\n"
+"\n"
+"Continuare la sessione?"
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/systray.py:249
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:310 ../src/tooltips.py:503
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:313 ../src/tooltips.py:507
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:318
+#: ../src/tooltips.py:335
 #, 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:416
+#: ../src/tooltips.py:432
 msgid " [blocked]"
 msgstr " [bloccato]"
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:436
 msgid " [minimized]"
 msgstr " [minimizzata]"
 
-#: ../src/tooltips.py:435 ../src/tooltips.py:623
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:465
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato: %s"
 
-#: ../src/tooltips.py:467
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " dalle %s"
 
-#: ../src/tooltips.py:485
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../src/tooltips.py:487
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:514
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Stanza:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Attivato"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipo:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:598
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:601 ../src/tooltips.py:622
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:607 ../src/tooltips.py:610
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:614
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:652
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:655
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5896,24 +9562,25 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:240
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:242
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "dalle %s"
 
-#: ../src/vcard.py:306
-msgid "Affiliation:"
-msgstr "Affiliazione: "
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Applicazioni</b>"
 
-#: ../src/vcard.py:314
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5921,7 +9588,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:316
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5929,14 +9596,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:318
+#: ../src/vcard.py:323
 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:320
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5944,1725 +9611,265 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:332
 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:332 ../src/vcard.py:369 ../src/vcard.py:492
-msgid " resource with priority "
-msgstr " risorsa con priorità "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "creazione database log"
-
-#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
-#: ../src/common/check_paths.py:114
-#, 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:97 ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
-msgid "Gajim will now exit"
-msgstr "Gajim sta per uscire"
-
-#: ../src/common/check_paths.py:122
-#, 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:138
-#, python-format
-msgid "creating %s directory"
-msgstr "creazione della cartella %s"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Modifica le informazioni sullo stato"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Modifica lo stato"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Imposta tipo di presenza e descrizione"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Libero per chat"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Online"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Assente a lungo"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Non disturbare"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Offline - disconnetti"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Descrizione della presenza:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Stato modificato."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s su %(room_jid)s"
-
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Non si è entrati in una chat di gruppo."
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Esci dalle chat di gruppo"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
-
-#: ../src/common/commands.py:230
-msgid "You left the following groupchats:"
-msgstr "Sei uscito dalle seguenti chat di gruppo:"
-
-#: ../src/common/commands.py:242
-msgid "Forward unread messages"
-msgstr "Inoltra messaggi non letti"
-
-#: ../src/common/commands.py:262
-msgid "All unread messages have been forwarded."
-msgstr "Tutti i messaggi non letti sono stati inoltrati."
-
-#: ../src/common/config.py:58
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Usa D-Bus e Notification-Daemon per mostrare le notifiche"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
-
-#: ../src/common/config.py:64
-msgid "Away as a result of being idle"
-msgstr "Assente per inattività"
-
-#: ../src/common/config.py:66
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tempo in minuti dopo il quale lo stato diventa 'non disponibile'."
-
-#: ../src/common/config.py:67
-msgid "Not available as a result of being idle"
-msgstr "Non disponibile per inattività"
-
-#: ../src/common/config.py:85
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
-
-#: ../src/common/config.py:90
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Abilità la messaggistica zeroconf sulla rete locale"
-
-#: ../src/common/config.py:93
-msgid "Language used by speller"
-msgstr "Lingua usata dal controllo ortografico"
-
-#: ../src/common/config.py:94
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'sempre' - scrive l'ora a ogni messaggio.\n"
-"'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
-"'mai' - non scrive mai l'ora."
-
-#: ../src/common/config.py:95
-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 ""
-"Scrive l'ora nelle chat usando l'orologio vago. Valore di vaghezza da 1 a 4, "
-"o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. "
-"Viene usato solo se print_time è 'sometimes'."
-
-#: ../src/common/config.py:98
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
-
-#: ../src/common/config.py:99
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
-"ma senza rimuovere * *."
-
-#: ../src/common/config.py:102
-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 ""
-"Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
-"ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
-
-#: ../src/common/config.py:111
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Carattere da aggiungere dopo il nickname quando si usa il completamento nick "
-"(tab) nella chat di gruppo."
-
-#: ../src/common/config.py:112
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Carattere da proporre di aggiungere dopo il nickname desiderato quando il "
-"nickname desiderato è già usato da qualcun'altro nella chat di gruppo"
-
-#: ../src/common/config.py:135
-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 ""
-"Questa opzione permette di personalizzare l'orario stampato nelle "
-"conversazioni. Per esempio, \"[%H:%M] \" mostrerà \"[ora:minuto] \". Vedere "
-"la documentazione della funzione python strftime per ottenere documentazione "
-"completa: http://docs.python.org/lib/module-time.html"
-
-#: ../src/common/config.py:136
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Caratteri scritti prima del nickname nelle conversazioni"
-
-#: ../src/common/config.py:137
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Caratteri scritti dopo il nickname nelle conversazioni"
-
-#: ../src/common/config.py:144
-msgid "Add * and [n] in roster title?"
-msgstr "Aggiungere * e [n] al titolo della lista contatti?"
-
-#: ../src/common/config.py:145
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Quante linee ricordare dalla precedente conversazione quando una scheda/"
-"finestra di chat viene riaperta."
-
-#: ../src/common/config.py:146
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Quanti minuti devono durare le ultime linee dalla conversazione precedente."
-
-#: ../src/common/config.py:147
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
-"(comportamento predefinito del client ICQ Mirabilis)."
-
-#: ../src/common/config.py:149
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Quante linee memorizzare per Ctrl+Alto."
-
-#: ../src/common/config.py:152
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
-"che significa usare wiktionary."
-
-#: ../src/common/config.py:155
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
-
-#: ../src/common/config.py:156
-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 ""
-"Se Vero, resta in ascolto di segnali D-Bus dal NetworkManager e cambia lo "
-"stato dell'account (a patto che  listen_to_network_manager non sia False e "
-"che sia sincronizzato con lo stato globale) basandosi sullo stato della "
-"connessione di rete."
-
-#: ../src/common/config.py:157
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
-
-#: ../src/common/config.py:158
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Le notifiche di stato mostrate nella finestra di chat. Possono essere una "
-"tra all, composing_only, disabled."
-
-#: ../src/common/config.py:160
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
-"scriverla ogni x minuti."
-
-#: ../src/common/config.py:161
-msgid "Ask before closing a group chat tab/window."
-msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
-
-#: ../src/common/config.py:162
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
-"questa lista separata da spazi di jid di stanze."
-
-#: ../src/common/config.py:163
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
-"lista separata da spazi di jid di stanze."
-
-#: ../src/common/config.py:166
-#, fuzzy
-msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
-msgstr ""
-"Lista di host separati da una virgola che saranno inviati, insieme alle "
-"interfacce locali, per il trasferimento file in caso di traslazione "
-"dell'indirizzo/inoltro porte."
-
-#: ../src/common/config.py:168
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
-
-#: ../src/common/config.py:170
-msgid "Notify of events in the system trayicon."
-msgstr "Notifica gli eventi nell'area di notifica."
-
-#: ../src/common/config.py:176
-msgid "Show tab when only one conversation?"
-msgstr "Mostrare scheda quando c'è una sola conversazione?"
-
-#: ../src/common/config.py:177
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
-
-#: ../src/common/config.py:178
-msgid "Show close button in tab?"
-msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
-
-#: ../src/common/config.py:179
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
-"registrazione dei messaggi?"
-
-#: ../src/common/config.py:188
-msgid "Preview new messages in notification popup?"
-msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
-
-#: ../src/common/config.py:193
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
-"chat multi-utente."
-
-#: ../src/common/config.py:194
-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 ""
-"Se Vero, esce da Gajim quando il pulsante X del Window Manager viene "
-"cliccato. Questa impostazione è presa in considerazione solo se viene usata "
-"l'icona nello spazio di notifica."
-
-#: ../src/common/config.py:195
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
-
-#: ../src/common/config.py:196
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
-"letti. A seconda del tema, questa icona può essere animata."
-
-#: ../src/common/config.py:197
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:199
-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 ""
-"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:200
-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 ""
-"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:201
-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 ""
-"può essere \"none\", \"all\" o \"in_and_out\". Se \"none\", Gajim non "
-"scriverà più la riga di stato nelle chat di gruppo quando un membro cambia "
-"il suo stato e/o il suo messaggio di stato. Se \"all\" Gajim scriverà tutti "
-"i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
-"entra od esce dalla chat di gruppo."
-
-#: ../src/common/config.py:203
-msgid "Background color of contacts when they just signed in."
-msgstr "Colore di sfondo dei contatti appena collegati."
-
-#: ../src/common/config.py:204
-msgid "Background color of contacts when they just signed out."
-msgstr "Colore di sfondo dei contatti appena scollegati."
-
-#: ../src/common/config.py:206
-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:207
-msgid "Don't show avatar for the transport itself."
-msgstr "Non mostrare l'avatar per il trasporto stesso."
-
-#: ../src/common/config.py:208
-msgid "Don't show roster in the system taskbar."
-msgstr "Non mostrare l'account nella taskbar del sistema."
-
-#: ../src/common/config.py:209
-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 ""
-"Se Vero e le versioni installate di GTK+ e PyGTK sono 2.8 o superiori, la "
-"finestra lampeggia (comportamento predefinito per la maggior parte dei "
-"gestori di finestre) quando contiene nuovi eventi."
-
-#: ../src/common/config.py:211
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Jabberd1.4 non vuole informazioni SHA quando ci si unisce ad una stanza "
-"protetta da password. Impostare a Falso per smettere di inviare informazioni "
-"SHA nella presenza sulle chat di gruppo"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:214
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Controlla la finestra dove vengono messi i nuovi messaggi.\n"
-"'always' - Tutti i messaggi vengono inviati ad una singola finestra.\n"
-"'never' - Ogni messaggio ottiene la sua finestra.\n"
-"'peracct' - I messaggi per ogni account vengono inviati ad una specifica "
-"finestra.\n"
-"'pertype' - Ogni tipo di messaggi (es., chat e chat di gruppo) viene inviato "
-"ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
-"di Gajim prima che le modifiche abbiano effetto"
-
-#: ../src/common/config.py:215
-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:216
-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:217
-msgid "Hides the buttons in chat windows."
-msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
-
-#: ../src/common/config.py:218
-msgid "Hides the banner in a group chat window"
-msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
-
-#: ../src/common/config.py:219
-msgid "Hides the banner in two persons chat window"
-msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
-
-#: ../src/common/config.py:220
-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:221
-msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
-msgstr ""
-"In una chat, mostra il nickname all'inizio della riga solo quando non è "
-"quello della persona che parlava nel messaggio precedente."
-
-#: ../src/common/config.py:222
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Indentazione quando si raggruppano nickname consecutivi."
-
-#: ../src/common/config.py:223
-msgid "Smooth scroll message in conversation window"
-msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
-
-#: ../src/common/config.py:224
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"Lista di colori che saranno usati per colorare i nickname nelle chat di "
-"gruppo."
-
-#: ../src/common/config.py:225
-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:226
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
-"vuota significa che non verrà mai mostrata."
-
-#: ../src/common/config.py:227
-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 ""
-"Se Vero, si può impostare una priorità negativa all'account nella finestra "
-"di modifica account. ATTENZIONE, quando si è collegati con priorità "
-"negativa, NON si riceveranno messaggi dal server."
-
-#: ../src/common/config.py:228
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
-"password degli account."
-
-#: ../src/common/config.py:229
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
-"degli account e dei gruppi."
-
-#: ../src/common/config.py:230
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-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:231
-msgid ""
-"If True, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
-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:232
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
-"usando dvips e convertendola prima di inserirla in una finestra di chat."
-
-#: ../src/common/config.py:233
-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:234
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
-msgstr ""
-"Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
-"più vecchie verranno cancellate."
-
-#: ../src/common/config.py:245
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
-"definite nelle opzioni autopriority_*."
-
-#. yes, no, ask
-#: ../src/common/config.py:275
-msgid "Jabberd2 workaround"
-msgstr "Workaround Jabberd2"
-
-#: ../src/common/config.py:279
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-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:338
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "OpenPGP è abilitato per questo contatto?"
-
-#: ../src/common/config.py:339 ../src/common/config.py:342
-msgid "Language for which we want to check misspelled words"
-msgstr "Linguaggio per il quale controllare le parole sbagliate"
-
-#: ../src/common/config.py:348
-msgid "all or space separated status"
-msgstr "tutto o stati separati da uno spazio"
-
-#: ../src/common/config.py:349
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', o 'both'"
-
-#: ../src/common/config.py:350 ../src/common/config.py:352
-#: ../src/common/config.py:353 ../src/common/config.py:356
-#: ../src/common/config.py:357
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' o 'both'"
-
-#: ../src/common/config.py:363
-msgid "Sleeping"
-msgstr "Dormo"
-
-#: ../src/common/config.py:364
-msgid "Back soon"
-msgstr "Torno presto"
-
-#: ../src/common/config.py:364
-msgid "Back in some minutes."
-msgstr "Torno tra qualche minuto."
-
-#: ../src/common/config.py:365
-msgid "Eating"
-msgstr "Mangio"
-
-#: ../src/common/config.py:365
-msgid "I'm eating, so leave me a message."
-msgstr "Sto mangiando, lascia pure un messaggio."
-
-#: ../src/common/config.py:366
-msgid "Movie"
-msgstr "Film"
-
-#: ../src/common/config.py:366
-msgid "I'm watching a movie."
-msgstr "Sto guardando un film."
-
-#: ../src/common/config.py:367
-msgid "Working"
-msgstr "Lavoro"
-
-#: ../src/common/config.py:367
-msgid "I'm working."
-msgstr "Sto lavorando."
-
-#: ../src/common/config.py:368
-msgid "Phone"
-msgstr "Telefono"
-
-#: ../src/common/config.py:368
-msgid "I'm on the phone."
-msgstr "Sono al telefono."
-
-#: ../src/common/config.py:369
-msgid "Out"
-msgstr "Fuori"
-
-#: ../src/common/config.py:369
-msgid "I'm out enjoying life."
-msgstr "Sono fuori a divertirmi."
-
-#: ../src/common/config.py:373
-msgid "I'm available."
-msgstr "Sono disponibile."
-
-#: ../src/common/config.py:374
-msgid "I'm free for chat."
-msgstr "Solo libero per chat."
-
-#: ../src/common/config.py:376
-msgid "I'm not available."
-msgstr "Non sono disponibile."
-
-#: ../src/common/config.py:377
-msgid "Do not disturb."
-msgstr "Non disturbare."
-
-#: ../src/common/config.py:378 ../src/common/config.py:379
-msgid "Bye!"
-msgstr "Ciao ciao!"
-
-#: ../src/common/config.py:388
-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 ""
-"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:389
-msgid "Sound to play when any MUC message arrives."
-msgstr "Suono da riprodurre quando un messaggio MUC arriva."
-
-#: ../src/common/config.py:398 ../src/common/optparser.py:208
-msgid "green"
-msgstr "verde"
-
-#: ../src/common/config.py:402 ../src/common/optparser.py:194
-msgid "grocery"
-msgstr "drogheria"
-
-#: ../src/common/config.py:406
-msgid "human"
-msgstr "umano"
-
-#: ../src/common/config.py:410
-msgid "marine"
-msgstr "marino"
-
-#: ../src/common/connection_handlers.py:56
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Impossibile caricare il modulo idle"
-
-#: ../src/common/connection_handlers.py:215
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-msgid "Wrong host"
-msgstr "Host errato"
-
-#: ../src/common/connection_handlers.py:216
-msgid "Invalid local address? :-O"
-msgstr "Indirizzo locale non valido? :-O"
-
-#: ../src/common/connection_handlers.py:608
-#, 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:1779
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nickname non permesso: %s"
-
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1849
-#: ../src/common/connection_handlers.py:1852
-#: ../src/common/connection_handlers.py:1855
-#: ../src/common/connection_handlers.py:1858
-#: ../src/common/connection_handlers.py:1862
-#: ../src/common/connection_handlers.py:1871
-msgid "Unable to join group chat"
-msgstr "Non è possibile entrare nella stanza"
-
-#: ../src/common/connection_handlers.py:1850
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Sei stato bandito dalla stanza %s."
-
-#: ../src/common/connection_handlers.py:1853
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "La stanza %s non esiste."
-
-#: ../src/common/connection_handlers.py:1856
-msgid "Group chat creation is restricted."
-msgstr "Non è permessa la creazione di stanze."
-
-#: ../src/common/connection_handlers.py:1859
-#, 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:1863
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
 
-#: ../src/common/connection_handlers.py:1872
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Il nickname desiderato è in uso o registrato da un altro partecipante alla "
-"chat di gruppo %s.\n"
-"Specificare un altro nickname sotto:"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1903
-msgid "Room has been destroyed"
-msgstr "La stanza è stata cancellata"
-
-#: ../src/common/connection_handlers.py:1910
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Puoi invece entrare in questa stanza: %s"
-
-#: ../src/common/connection_handlers.py:1937
-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:1958
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "si è ora abbonati a %s"
-
-#: ../src/common/connection_handlers.py:1960
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "richiesta di cancellazione abbonamento da %s"
-
-#: ../src/common/connection_handlers.py:1962
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "è stato ora cancellato l'abbonamento a %s"
-
-#: ../src/common/connection_handlers.py:2084
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Il JID %s non rispetta la RFC. Non verrà aggiunto ai contatti. Usare "
-"strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
-"rimuoverlo"
-
-#: ../src/common/connection.py:244
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Connessione con l'account \"%s\" persa"
-
-#: ../src/common/connection.py:245
-msgid "Reconnect manually."
-msgstr "Riconnetti manualmente."
-
-#: ../src/common/connection.py:256
-#, python-format
-msgid "Server %s answered wrongly to register request: %s"
-msgstr ""
-"Il server %s ha risposto in maniera errata alla richiesta di registrazione: %"
-"s"
-
-#. wrong answer
-#: ../src/common/connection.py:264
-msgid "Invalid answer"
-msgstr "Risposta non valida"
-
-#: ../src/common/connection.py:265
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
-"Il trasporto %s ha risposto in maniera errata alla richiesta di "
-"registrazione: %s"
-
-#: ../src/common/connection.py:411
-msgid "Connection to proxy failed"
-msgstr "Connessione al proxy fallita"
-
-#: ../src/common/connection.py:465 ../src/common/connection.py:511
-#: ../src/common/connection.py:1067
-#: ../src/common/zeroconf/connection_zeroconf.py:237
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Non è possibile connettersi a \"%s\""
-
-#: ../src/common/connection.py:479
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Connesso al server %s:%s con %s"
-
-#: ../src/common/connection.py:512
-msgid "Check your connection or try again later"
-msgstr "Controllare la connessione o riprovare più tardi"
-
-#: ../src/common/connection.py:537
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Autenticazione con \"%s\" fallita"
-
-#: ../src/common/connection.py:538
-msgid "Please check your login and password for correctness."
-msgstr "Verificare la correttezza di login e password."
-
-#: ../src/common/connection.py:581
-msgid "Error while removing privacy list"
-msgstr "Errore durante la rimozione della lista privacy"
-
-#: ../src/common/connection.py:582
-#, 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 ""
-"La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
-"risorse connesse. Disattivarla e riprovare."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:682
-#: ../src/common/zeroconf/connection_zeroconf.py:163
-msgid "OpenPGP passphrase was not given"
-msgstr "Non è stata impostata la passphrase OpenPGP"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:845
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
-
-#: ../src/common/connection.py:916
-#: ../src/common/zeroconf/connection_zeroconf.py:423
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Oggetto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1099
-msgid "Not fetched because of invisible status"
-msgstr "Non ottenuto a causa di stato invisibile"
-
-#: ../src/common/contacts.py:294
-msgid "Not in roster"
-msgstr "Non nei contatti"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
-
-#: ../src/common/exceptions.py:39
-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:47
-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:55
-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"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "uno"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "due"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tre"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "quattro"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "cinque"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "sei"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "sette"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "otto"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "nove"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "dieci"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "undici"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "dodici"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 in punto"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 e cinque"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 e dieci"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 e un quarto"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 e venti"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 e venticinque"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 e mezza"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$0 e trentacinque"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "venti alle $1"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "un quarto alle $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "dieci alle %1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "cinque alle $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 in punto"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Notte"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Mattino presto"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Mattino"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Quasi mezzogiorno"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Mezzogiorno"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Pomeriggio"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Sera"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Tarda sera"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Inizio della settimana"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Metà settimana"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Fine settimana"
-
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Fine settimana!"
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in username."
-msgstr "Carattere non valido nel nome utente."
-
-#: ../src/common/helpers.py:120
-msgid "Server address required."
-msgstr "Indirizzo del server richiesto."
-
-#: ../src/common/helpers.py:125
-msgid "Invalid character in hostname."
-msgstr "Carattere non valido nell'hostname."
-
-#: ../src/common/helpers.py:131
-msgid "Invalid character in resource."
-msgstr "Carattere non valido nella risorsa."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:174
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:185
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:188
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:191
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:222
-msgid "_Busy"
-msgstr "O_ccupato"
-
-#: ../src/common/helpers.py:224
-msgid "Busy"
-msgstr "Occupato"
-
-#: ../src/common/helpers.py:227
-msgid "_Not Available"
-msgstr "_Non disponibile"
-
-#: ../src/common/helpers.py:232
-msgid "_Free for Chat"
-msgstr "_Libero per chat"
-
-#: ../src/common/helpers.py:234
-msgid "Free for Chat"
-msgstr "Libero per chat"
-
-#: ../src/common/helpers.py:237
-msgid "_Available"
-msgstr "_Disponibile"
-
-#: ../src/common/helpers.py:239
-msgid "Available"
-msgstr "Disponibile"
-
-#: ../src/common/helpers.py:241
-msgid "Connecting"
-msgstr "Connessione in corso"
-
-#: ../src/common/helpers.py:244
-msgid "A_way"
-msgstr "_Assente"
-
-#: ../src/common/helpers.py:249
-msgid "_Offline"
-msgstr "_Offline"
-
-#: ../src/common/helpers.py:251
-msgid "Offline"
-msgstr "Offline"
-
-#: ../src/common/helpers.py:254
-msgid "_Invisible"
-msgstr "_Invisibile"
-
-#: ../src/common/helpers.py:260
-msgid "?contact has status:Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/common/helpers.py:262
-msgid "?contact has status:Has errors"
-msgstr "Ci sono errori"
-
-#: ../src/common/helpers.py:267
-msgid "?Subscription we already have:None"
-msgstr "Nessuno"
-
-#: ../src/common/helpers.py:269
-msgid "To"
-msgstr "A"
-
-#: ../src/common/helpers.py:273
-msgid "Both"
-msgstr "Entrambi"
-
-#: ../src/common/helpers.py:281
-msgid "?Ask (for Subscription):None"
-msgstr "Nulla"
-
-#: ../src/common/helpers.py:283
-msgid "Subscribe"
-msgstr "Abbonati"
-
-#: ../src/common/helpers.py:292
-msgid "?Group Chat Contact Role:None"
-msgstr "Nessuno"
-
-#: ../src/common/helpers.py:295
-msgid "Moderators"
-msgstr "Moderatori"
-
-#: ../src/common/helpers.py:297
-msgid "Moderator"
-msgstr "Moderatore"
-
-#: ../src/common/helpers.py:300
-msgid "Participants"
-msgstr "Partecipanti"
-
-#: ../src/common/helpers.py:302
-msgid "Participant"
-msgstr "Participante"
-
-#: ../src/common/helpers.py:305
-msgid "Visitors"
-msgstr "Visitatori"
-
-#: ../src/common/helpers.py:307
-msgid "Visitor"
-msgstr "Visitatore"
-
-#: ../src/common/helpers.py:313
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Nessuna"
-
-#: ../src/common/helpers.py:315
-msgid "Owner"
-msgstr "Proprietario"
-
-#: ../src/common/helpers.py:317
-msgid "Administrator"
-msgstr "Amministratore"
-
-#: ../src/common/helpers.py:319
-msgid "Member"
-msgstr "Membro"
-
-#: ../src/common/helpers.py:358
-msgid "is paying attention to the conversation"
-msgstr "sta seguendo la conversazione"
-
-#: ../src/common/helpers.py:360
-msgid "is doing something else"
-msgstr "sta facendo altro"
-
-#: ../src/common/helpers.py:362
-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:365
-msgid "paused composing a message"
-msgstr "ha smesso di scrivere"
-
-#: ../src/common/helpers.py:367
-msgid "has closed the chat window or tab"
-msgstr "ha chiuso la finestra o scheda di chat"
-
-#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
-#, 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:926
-#, python-format
-msgid " from room %s"
-msgstr " dalla stanza %s"
-
-#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
-#, python-format
-msgid " from user %s"
-msgstr " dall'utente %s"
-
-#: ../src/common/helpers.py:931
-#, python-format
-msgid " from %s"
-msgstr " da %s"
-
-#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
-#, 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:978
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "errore: impossibile aprire %s per lettura"
-
-#: ../src/common/optparser.py:203 ../src/common/optparser.py:204
-msgid "cyan"
-msgstr "cyan"
-
-#: ../src/common/optparser.py:320
-msgid "migrating logs database to indices"
-msgstr "Migrazione database delle cronologie agli indici"
-
-#: ../src/common/passwords.py:82
-#, python-format
-msgid "Gajim account %s"
-msgstr "Account Gajim %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:135
-#: ../src/common/zeroconf/client_zeroconf.py:218
-msgid "Connection to host could not be established"
-msgstr "La connessione non può essere stabilita."
-
-#: ../src/common/zeroconf/client_zeroconf.py:192
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"La connessione all'host non può esser stabilita: risposta incorretta dal "
-"server."
-
-#: ../src/common/zeroconf/client_zeroconf.py:352
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"La connessione all'host non può esser stabilita: Tempo scaduto durante "
-"l'invio di dati."
-
-#: ../src/common/zeroconf/client_zeroconf.py:638
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
-"valida, perciò sarà ignorato."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-msgid "Avahi error"
-msgstr "Errore avahi"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"La messaggistica sulla rete locale potrebbe non funzionare correttamente."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:238
-msgid "Please check if Avahi is installed."
-msgstr "Controllare se Avahi è installato."
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " risorsa con priorità "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:247
-#: ../src/common/zeroconf/connection_zeroconf.py:251
-msgid "Could not start local service"
-msgstr "Impossibile avviare il servizio locale"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Cifratura OpenPGP"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:248
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Impossibile collegarsi alla porta %d."
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
-#: ../src/common/zeroconf/connection_zeroconf.py:347
-msgid "Please check if avahi-daemon is running."
-msgstr "Controllare se avahi-daemon è in esecuzione."
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:346
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la "
+#~ "terza persona (esempio: /%s esplode)."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Tu non sei connesso o non sei visibile ad altri. Il tuo messaggio non può "
-"essere inviato."
+#~ msgid "Encryption enabled"
+#~ msgstr "Cifratura attivata"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:375
-msgid "[This message is encrypted]"
-msgstr "[Questo messaggio è cifrato]"
+#~ msgid "Encryption disabled"
+#~ msgstr "Cifratura disattivata"
 
-#~ msgid "%s does not appear to be a valid JID"
-#~ msgstr "%s non sembra essere un JID valido"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Clicca per vedere le conversazioni precedenti con questo contatto"
 
-#~ msgid "Blocked Contacts"
-#~ msgstr "Contatti bloccati"
+#~ msgid "Invite _Friends"
+#~ msgstr "Invita _amici"
 
-#~ msgid "In_vite"
-#~ msgstr "In_vita"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Clicca per vedere le conversazioni precedenti di questa stanza"
 
-#~ msgid "Invite Friends!"
-#~ msgstr "Invita amici!"
+#~ msgid "<b>History Viewer</b>"
+#~ msgstr "<b>Gestore cronologia</b>"
 
-#~ msgid "MUC server"
-#~ msgstr "Server MUC"
+#~ msgid "<b>JID Selection</b>"
+#~ msgstr "<b>Selezione JID</b>"
 
-#~ msgid "Please select a MUC server."
-#~ msgstr "Selezionare un server MUC."
+#~ msgid "Build custom query"
+#~ msgstr "Costruisci richiesta personalizzata"
 
 #~ msgid ""
-#~ "You are going to begin a Multi-User Chat.\n"
-#~ "Select the contacts you want to invite"
+#~ "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"
 #~ msgstr ""
-#~ "Stai per iniziare una chat di gruppo.\n"
-#~ "Scegli i contatti che vuoi invitare"
+#~ "Inserisci il JID di un contatto o di una stanza di gruppo per "
+#~ "visualizzarne la cronologia.\n"
+#~ "Se il contatto è connesso puoi anche inserire il suo nickname.\n"
 
-#~ msgid "<b>List of possible features in Gajim:</b>"
-#~ msgstr "<b>Lista delle possibili funzioni extra di Gajim:</b>"
+#~ msgid "Query Builder..."
+#~ msgstr "Costruttore richieste..."
 
-#, fuzzy
-#~ msgid "Features"
-#~ msgstr "Servizi del server"
+#~ msgid "Accept"
+#~ msgstr "Accetta"
 
-#~ msgid "Please wait while retrieving search form..."
-#~ msgstr "Attendere durante il recupero dei campi di ricerca..."
+#~ msgid "Invitation Received"
+#~ msgstr "Invito ricevuto"
 
-#~ msgid "_Add contact"
-#~ msgstr "_Aggiungi contatto"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Formato di una linea</b>"
 
-#~ msgid "Select the account with which you want to synchronise"
-#~ msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
-
-#~ msgid "Select the contacts you want to synchronise"
-#~ msgstr "Seleziona i contatti che vuoi sincronizzare"
-
-#~ msgid "Synchronise : select contacts"
-#~ msgstr "Sincronizzazione: scegli i contatti"
-
-#~ msgid "PyOpenSSL"
-#~ msgstr "PyOpenSSL"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Un esempio: se si ha abilitato il messaggio di stato per l'assenza, Gajim "
+#~ "non chiederà più il messaggio di stato quando si diventa assente; verrà "
+#~ "usato il valore predefinito impostato qui"
 
 #~ msgid ""
-#~ "A library used to validate server certificates to ensure a secure "
-#~ "connection."
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
 #~ msgstr ""
-#~ "Una libreria usata per validare i certificati del server per assicurare "
-#~ "una connessione sicura."
+#~ "Determinato dal mittente\n"
+#~ "Messaggio di chat\n"
+#~ "Messaggio singolo"
 
-#~ msgid "Requires python-pyopenssl."
-#~ msgstr "Richiede python-pyopenssl."
+#~ msgid "Events"
+#~ msgstr "Eventi"
 
-#~ msgid "Bonjour / Zeroconf"
-#~ msgstr "Bonjour/Zeroconf"
+#~ msgid "Hides buttons in chatwindows to "
+#~ msgstr "Nasconde i pulsanti nella finestra di chat"
 
-#~ msgid "Serverless chatting with autodetected clients in a local network."
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
 #~ msgstr ""
-#~ "Sistema di chat senza server con i client rilevati automaticamente nella "
-#~ "rete locale."
+#~ "Mai\n"
+#~ "Sempre\n"
+#~ "Per account\n"
+#~ "Per tipo"
 
-#~ msgid "Requires python-avahi."
-#~ msgstr "Richiede python-avahi."
+#~ msgid "Privacy"
+#~ msgstr "Privacy"
 
-#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-#~ msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr ""
+#~ "Imposta il messaggio di stato in modo che rifletta la traccia _musicale "
+#~ "in riproduzione"
 
-#~ msgid "gajim-remote"
-#~ msgstr "gajim-remote"
+#~ msgid "The auto away status message"
+#~ msgstr "Il messaggio di stato per l'assenza automatica"
 
-#~ msgid "A script to controle gajim via commandline."
-#~ msgstr "Uno script per controllare gajim dalla riga di comando."
+#~ msgid "The auto not available status message"
+#~ msgstr "Il messaggio di stato per il 'non disponibile' automatico"
 
-#~ msgid "Requires python-dbus."
-#~ msgstr "Richiede python-dbus."
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Trattare tutti i messaggi in arrivo come:"
 
-#~ msgid "Feature not available under Windows."
-#~ msgstr "Caratteristica non disponibile sotto Windows."
+#~ msgid "Use only one message _window:"
+#~ msgstr "Usa solo una _finestra dei messaggi:"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Funziona con Rhythmbox e Muine. Per altri player, visita http://trac."
+#~ "gajim.org/wiki/GajimAndMusicPlayer"
 
-#~ msgid "Encrypting chatmessages with gpg keys."
-#~ msgstr "Cifratura dei messaggi di chat con le chiavi gpg."
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Controllo notifiche _avanzato..."
 
-#~ msgid "Requires gpg and python-GnuPGInterface."
-#~ msgstr "Richiede gpg e python-GnuPGInterface"
+#~ msgid "_Font:"
+#~ msgstr "_Carattere:"
 
-#~ msgid "network-manager"
-#~ msgstr "Gestore connessione"
+#~ msgid "_Player:"
+#~ msgstr "_Riproduttore:"
 
-#~ msgid "Autodetection of network status."
-#~ msgstr "Riconoscimento automatico dello stato della connessione."
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#~ msgid "Requires gnome-network-manager and python-dbus."
-#~ msgstr "Richiede gnome-network-manager e python-dbus."
+#~ msgid "Address"
+#~ msgstr "Indirizzo"
 
-#~ msgid "Session Management"
-#~ msgstr "Gestore sessioni"
+#~ msgid "City:"
+#~ msgstr "Città:"
 
-#~ msgid "Gajim session is stored on logout and restored on login."
-#~ msgstr ""
-#~ "La sessione di Gajim viene salvata alla chiusura e ripristinata all'avvio."
+#~ msgid "Company:"
+#~ msgstr "Società:"
 
-#~ msgid "Requires python-gnome2."
-#~ msgstr "Richiede python-gnome2."
+#~ msgid "Country:"
+#~ msgstr "Paese:"
 
-#~ msgid "gnome-keyring"
-#~ msgstr "Gestore portachiavi"
+#~ msgid "Given:"
+#~ msgstr "Nome:"
 
-#~ msgid "Passwords can be stored securely and not just in plaintext."
-#~ msgstr ""
-#~ "Le password possono essere salvate in modo sicuro e non in un semplice "
-#~ "file di testo."
+#~ msgid "Middle:"
+#~ msgstr "Secondo nome:"
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop."
-#~ msgstr "Richiede gnome-keyring e python-gnome2-desktop."
+#~ msgid "Position:"
+#~ msgstr "Titolo:"
 
-#~ msgid "SRV"
-#~ msgstr "SRV"
+#~ msgid "Prefix:"
+#~ msgstr "Prefisso:"
 
-#~ msgid "Ability to connect to servers which is using SRV records."
-#~ msgstr "Possibilità di connettersi ai server che usano record SRV."
+#~ msgid "Role:"
+#~ msgstr "Ruolo:"
 
-#~ msgid "Requires dnsutils."
-#~ msgstr "Richiede dnsutils."
+#~ msgid "State:"
+#~ msgstr "Regione:"
 
-#~ msgid "Requires nslookup to use SRV records."
-#~ msgstr "Richiede nslookup per usare i record SRV."
+#~ msgid "Suffix:"
+#~ msgstr "Suffisso:"
 
-#~ msgid "Spell Checker"
-#~ msgstr "Correttore ortografico"
+#~ msgid "A_ccounts"
+#~ msgstr "_Account"
 
-#~ msgid "Spellchecking of composed messages."
-#~ msgstr "Correzione ortografica dei messaggi."
+#~ msgid "Ask:"
+#~ msgstr "Chiedi:"
 
-#~ msgid ""
-#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
-#~ "Gajim sources."
-#~ msgstr ""
-#~ "Richiede python-gnome2-extras o la compilazione del modulo gtkspell dai "
-#~ "sorgenti di Gajim."
+#~ msgid "Client:"
+#~ msgstr "Client:"
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Demone delle notifiche"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#~ msgid "Passive popups notifying for new events."
-#~ msgstr "Popup passivi che notificano nuovi eventi."
+#~ msgid "Subscription:"
+#~ msgstr "Abbonamento:"
 
-#~ msgid ""
-#~ "Requires python-notify or instead python-dbus in conjunction with "
-#~ "notification-daemon."
-#~ msgstr "Richiede python-notify, oppure python-dbus e notification-daemon."
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Lo vedrai sempre come offline."
 
-#~ msgid "Trayicon"
-#~ msgstr "Icona nell'area di notifica"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s è ora %s (%s)"
 
-#~ msgid "A icon in systemtray reflecting the current presence."
-#~ msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
+#~ msgid "%s is now %s"
+#~ msgstr "%s è ora %s"
 
 #~ msgid ""
-#~ "Requires python-gnome2-extras or compiled  trayicon module from Gajim "
-#~ "sources."
+#~ "\n"
+#~ "From: %(from_address)s"
 #~ msgstr ""
-#~ "Richiede python-gnome2-extras oppure la compilazione del modulo trayicon "
-#~ "dai sorgenti di Gajim."
-
-#~ msgid "Requires PyGTK >= 2.10."
-#~ msgstr "Richiede PyGTK >= 2.10."
+#~ "\n"
+#~ "Da: %(from_address)s"
 
-#~ msgid "Idle"
-#~ msgstr "Inattivatore"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Supporto Network Manager non disponibile"
 
-#~ msgid "Ability to measure idle time, in order to set auto status."
+#~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr ""
-#~ "Possibilità di misurare il tempo di inattività, per poter cambiare lo "
-#~ "stato automaticamente."
-
-#~ msgid "Requires compilation of the idle module from Gajim sources."
-#~ msgstr "Richiede la compilazione del modulo idle dai sorgenti di Gajim."
-
-#~ msgid "LaTeX"
-#~ msgstr "LaTeX"
-
-#~ msgid "Transform LaTeX espressions between $$ $$."
-#~ msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
+#~ "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
 #~ msgid ""
-#~ "Requires texlive-latex-base, dvips and imagemagick. You have to set "
-#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
 #~ msgstr ""
-#~ "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare "
-#~ "'use_latex' su Attivato nell'Editor di configurazione avanzata."
+#~ "Utilizzo: %s %s %s \n"
+#~ "\t %s"
 
-#~ msgid "End to end encryption"
-#~ msgstr "Attiva cifratura end-to-end"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#~ msgid "Encrypting chatmessages."
-#~ msgstr "Cifratura dei messaggi di chat."
+#~ msgid "_New group chat"
+#~ msgstr "_Nuova chat di gruppo"
 
-#~ msgid "Requires python-crypto."
-#~ msgstr "Richiede python-crypto."
+#~ msgid "_Log off"
+#~ msgstr "_Disconnetti"
 
-#, fuzzy
-#~ msgid "RST Generator"
-#~ msgstr "Generatore RST"
+#~ msgid "_Log on"
+#~ msgstr "_Connetti"
 
-#~ msgid ""
-#~ "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
-#~ "docs/ref/rst/restructuredtext.html)."
-#~ msgstr ""
-#~ "Genera output XHTML a partire da codice RST (vedi http://docutils."
-#~ "sourceforge.net/docs/ref/rst/restructuredtext.html)."
+#~ msgid "Save passphrase"
+#~ msgstr "Memorizza passphrase"
 
-#~ msgid "Requires python-docutils."
-#~ msgstr "Richiede python-docutils."
+#~ msgid "Affiliation:"
+#~ msgstr "Affiliazione: "
 
-#~ msgid "Feature"
-#~ msgstr "Funzione"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Connesso al server %s:%s con %s"
 
-#~ msgid "- messages will be logged"
-#~ msgstr "- i messaggi saranno registrati"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "La connessione non può essere stabilita."
 
-#~ msgid "- messages will not be logged"
-#~ msgstr "- i messaggi non saranno registrati"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "La connessione all'host non può esser stabilita: risposta incorretta dal "
+#~ "server."
 
-#~ msgid "Verify the remote client's identity"
-#~ msgstr "Verifica l'identità del client remoto"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s non sembra essere un JID valido"
 
 #~ msgid ""
 #~ "You've begun an encrypted session with %s, but it can't be guaranteed "
@@ -7678,18 +9885,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ "Dovresti parlarci direttamente (di persona o al telefono) e confermare "
 #~ "che la sua stringa di autenticazione sia identica a questa: %s"
 
-#~ msgid "Waiting for results"
-#~ msgstr "Ricerca in corso"
-
-#~ msgid "Error in received dataform"
-#~ msgstr "Errore nella ricezione dei dati"
-
-#~ msgid "No result"
-#~ msgstr "Nessun risultato"
-
-#~ msgid "Error while adding service. %s"
-#~ msgstr "Errore durante la creazione del servizio. %s"
-
 #~ msgid "_Add Contact"
 #~ msgstr "_Aggiungi contatto"
 
@@ -7738,9 +9933,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ "Se marcato, Gajim manterrà le posizioni delle finestre di chat e della "
 #~ "lista contatti sullo schermo la prossima volta che verrà eseguito"
 
-#~ msgid "On every _message"
-#~ msgstr "In tutti i _messaggi"
-
 #~ msgid "Outgoing Chat state noti_fications:"
 #~ msgstr "Noti_fiche dello stato di chat in uscita"
 
@@ -7799,9 +9991,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "_Use proxy"
 #~ msgstr "_Usa proxy"
 
-#~ msgid "Accounts"
-#~ msgstr "Account"
-
 #~ 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 "
@@ -7826,9 +10015,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "_Abilita la messaggistica sulla rete locale"
 
-#~ msgid "_Modify"
-#~ msgstr "_Modifica"
-
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
 
@@ -7940,9 +10126,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "_Before time:"
 #~ msgstr "_Prima dell'ora:"
 
-#~ msgid "_Publish"
-#~ msgstr "_Pubblica"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Recupera"
 
@@ -7985,9 +10168,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nome della stanza o del server non valido"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Versione D-Bus sconosciuta: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "La vCard è stata pubblicata correttamente"
 
@@ -8011,9 +10191,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "Send File"
 #~ msgstr "Invia file"
 
-#~ msgid "Underline"
-#~ msgstr "Sottolinea"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Entra in nuova stanza..."
 
@@ -8038,9 +10215,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Usa vista compatta quando si apre una finestra di chat di gruppo"
 
-#~ msgid "plain"
-#~ msgstr "semplice"
-
 #~ msgid "Send"
 #~ msgstr "Invia"
 
@@ -8068,9 +10242,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "I log sono stati migrati con successo al database."
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Inizia chat con il contatto"
@@ -8279,9 +10450,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgid "_Latest"
 #~ msgstr "_Ultimo"
 
-#~ msgid "_Previous"
-#~ msgstr "_Precedente"
-
 #~ msgid "Filter query too short"
 #~ msgstr "Richiesta filtro troppo breve"
 
@@ -8400,9 +10568,6 @@ msgstr "[Questo messaggio è cifrato]"
 #~ msgstr[0] "Gajim - un messaggio non letto"
 #~ msgstr[1] "Gajim - %d messaggi non letti"
 
-#~ msgid "Unknown type %s "
-#~ msgstr "Tipo sconosciuto %s "
-
 #~ msgid "Gajim disconnected you from %s"
 #~ msgstr "Gajim si è disconnesso da %s"
 
diff --git a/po/lt.po b/po/lt.po
index 238f2f253..0ddadd76a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,15 +3,11 @@
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
 # Mantas Zimnickas <sirexas@yahoo.com>, 2007.
 #
-#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
-#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
-#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-12 09:53+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-21 15:27+1100\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian\n"
@@ -33,7 +29,7 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM Klientas"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Prisijungti prie pokalbio grupėje"
@@ -43,7 +39,7 @@ msgid "_Add Contact..."
 msgstr "_Įtraukti asmenį..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
@@ -61,12 +57,17 @@ msgid "_Open Gmail Inbox"
 msgstr "_Atidaryti Gmail paštą"
 
 #: ../data/glade/account_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:22
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Asmeninė Informacija"
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Pradėti pokalbį"
 
-#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/account_context_menu.glade.h:9
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Būklė"
@@ -87,7 +88,8 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, fuzzy
+msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Prašome užpildyti naujos Jūsų prieigos duomenis</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
@@ -95,64 +97,70 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr "Jabber serverių paslaugų sąrašas (tokių, kaip: MSN, ICQ pernašos)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Prisijungti, kai paspausiu Baigti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Prieigos kūrimo vedlys"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Jau turiu prieigą, kurią noriu naudoti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Noriu už_registruoti naują prieigą"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Valdyti..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proksis:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #: ../data/glade/account_modification_window.glade.h:40
 #: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Išsaugoti _slaptažodį"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Serverio teikiamos paslaugos"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Nustatyti mano profilį, kai prisijungsiu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 #: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -160,47 +168,47 @@ msgstr ""
 "Kad prisijungtumėte privalote turėti prieigą\n"
 "Jabber tinkle."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Jūsų JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Papildomas"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Baigti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Serverio adresas: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
 #: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Portas:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:31
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Naudotojo vardas:"
 
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Įvairūs</b>"
 
@@ -217,7 +225,7 @@ msgid "<b>Personal Information</b>"
 msgstr "<b>Asmeninė informacija</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Prieiga"
 
@@ -226,29 +234,28 @@ msgid "Account Modification"
 msgstr "Prieigos keitimas"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:7
 #, fuzzy
 msgid "Administration operations"
 msgstr "Administrator List"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:8
 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:7
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 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:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "_Keisti slaptažodį"
 
 #: ../data/glade/account_modification_window.glade.h:10
-#: ../data/glade/accounts_window.glade.h:9
 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 "
@@ -260,59 +267,60 @@ msgstr ""
 "serveris užklausia ir jei ši parinktis yra aktyvi, TLS bus deaktyvuotas"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Pasirinkite _Raktą..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:13
 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:12
+#: ../data/glade/accounts_window.glade.h:14
 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:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Prisijungimas"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Keisti asmeninę informaciją..."
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:471
-#: ../src/notify.py:493 ../src/notify.py:505 ../src/common/helpers.py:964
-#: ../src/common/helpers.py:976
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 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:19
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:359 ../src/roster_window.py:624
-#: ../src/roster_window.py:1360 ../src/roster_window.py:1728
-#: ../src/roster_window.py:2112 ../src/roster_window.py:2628
-#: ../src/roster_window.py:2746 ../src/common/contacts.py:309
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Bendros parinktys"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Serverio adresas: "
 
 #: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:23
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -321,7 +329,7 @@ msgstr ""
 "pagerės bylos siuntimas."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -330,7 +338,6 @@ msgstr ""
 "ryšys, dėl ko gali įvyksta savaiminiai atsijungimai"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/accounts_window.glade.h:24
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -340,7 +347,7 @@ msgstr ""
 "skaitymui' teisėmis, tik Jums"
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -350,7 +357,7 @@ msgstr ""
 "naudodamas šią prieigą"
 
 #: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -361,49 +368,48 @@ msgstr ""
 "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:29
+#: ../data/glade/accounts_window.glade.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:34
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1524
-#: ../src/config.py:2010
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Raktas nepasirinktas"
 
 #. None means no proxy profile selected
-#. GPG Key
 #: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1110
-#: ../src/config.py:1181 ../src/config.py:1430 ../src/config.py:1435
-#: ../src/config.py:1906 ../src/config.py:1993 ../src/config.py:2009
-#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:286
-#: ../src/dialogs.py:288 ../src/roster_window.py:1832
-#: ../src/roster_window.py:1839 ../src/roster_window.py:1846
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Joks"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Prievadas: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "_Prioritetas:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -414,22 +420,21 @@ msgstr ""
 "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/glade/accounts_window.glade.h:43
 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
-#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proksis:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Šal_tinis:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -444,7 +449,6 @@ msgstr ""
 "turi didžiausią prioritetą gaus visus pranešimus. (žiūrėkite žemiau)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Išsaugoti _slaptafrazę (nesaugu)"
@@ -468,12 +472,13 @@ msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 
 #: ../data/glade/account_modification_window.glade.h:43
 #: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
 #: ../data/glade/account_modification_window.glade.h:44
-#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Naudoti _SSL (legacy)"
 
@@ -496,27 +501,45 @@ msgstr "_Jabber ID:"
 msgid "_Name:"
 msgstr "_Pavadinimas:"
 
-#: ../data/glade/accounts_window.glade.h:14
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<i>Privatus Sąrašas</i>"
+
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Accounts"
+msgstr "Prieiga"
+
+#: ../data/glade/accounts_window.glade.h:11
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:16
 #: ../data/glade/zeroconf_information_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "El. paštas:"
 
 #. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
 #: ../data/glade/xml_console_window.glade.h:4
 msgid "Enable"
 msgstr "Įjungti"
 
-#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Vardas:"
 
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
+
+#: ../data/glade/accounts_window.glade.h:29
 #: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
@@ -527,45 +550,57 @@ msgstr ""
 "neatitinka jūsų nustatymų, čia galite pasirinkti kitą.\n"
 "Turėtumėte pakeisti leistinus ugniasienės nustatymus."
 
-#: ../data/glade/accounts_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:453
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
 #: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Pavardė:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "Apjun_gti prieigas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2698
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Pe_rvadinti"
 
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
+
 #: ../data/glade/accounts_window.glade.h:54
 #: ../data/glade/zeroconf_properties_window.glade.h:21
 msgid "Use custom port:"
 msgstr "Use custom port:"
 
 #: ../data/glade/accounts_window.glade.h:59
-msgid "gtk-add"
+msgid "_Warn before using an insecure connection"
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:60
-msgid "gtk-close"
+msgid "gtk-add"
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "gtk-remove"
 msgstr ""
 
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
+
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Prieiga:"
@@ -659,6 +694,7 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Aprašymas</b>"
 
@@ -736,7 +772,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Sąlygos</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Garsai</b>"
 
@@ -753,7 +789,7 @@ msgid "All statuses"
 msgstr "Visos būklės"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:246
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Manęs nėra"
 
@@ -770,7 +806,7 @@ msgid "Have "
 msgstr "Turiu "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Nematomas"
 
@@ -779,7 +815,7 @@ msgid "Launch a command"
 msgstr "Paleisti komandą"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
@@ -904,6 +940,34 @@ msgstr "Gautas naujas įrašas"
 msgid "You have received new entry:"
 msgstr "Jūs gavote naują įrašą:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Contacts"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Nustatytosios būklės žinutės</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Savybės</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Garsai</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Keisti slaptažodį"
@@ -933,7 +997,7 @@ msgid "Join _Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "Įtr_aukti į kontaktų sąrašą"
@@ -961,42 +1025,64 @@ msgid "_Start Chat"
 msgstr "_Pradėti pokalbį"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Spauskite, kad pamatytumėte buvusius pokalbius su šiuo asmeniu"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Rename Contact"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-msgid "Invite _Friends"
-msgstr ""
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Siųsti _Failą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Įjungti Open_PGP kodavimą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Įjungti Open_PGP kodavimą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "Įtr_aukti į kontaktų sąrašą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
-#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2567
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Istorija"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Pak_viesti į"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observers"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Užpildykite formą."
@@ -1009,6 +1095,24 @@ msgstr "Kambario nustatymai"
 msgid "Edit Groups"
 msgstr "Keisti grupę"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Aprašymas</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Serverio teikiamos paslaugos"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
@@ -1061,7 +1165,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Tęsti"
 
@@ -1069,7 +1173,7 @@ msgstr "_Tęsti"
 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:186
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Atidaryti katalogą, kuriame yra failas"
 
@@ -1117,7 +1221,7 @@ msgstr "Gajim temų keitimas"
 msgid "Gone"
 msgstr "Dingo"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Neaktyvus"
 
@@ -1168,29 +1272,25 @@ msgid "Change _Subject..."
 msgstr "Keisti _temą"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Spauskite, kad pamatytumėte buvusius pokalbius šiame kambaryje"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Keisti kambario nustatymus"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:5
+#: ../data/glade/gc_control_popup_menu.glade.h:4
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Žy_mėti šį kambarį"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:5
 msgid "_Destroy Room"
 msgstr ""
 
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/glade/gc_control_popup_menu.glade.h:7
 #, fuzzy
 msgid "_Manage Room"
 msgstr "Žymių valdymas"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:9
+#: ../data/glade/gc_control_popup_menu.glade.h:8
 msgid "_Minimize on close"
 msgstr ""
 
@@ -1235,22 +1335,19 @@ msgstr "_Balsas"
 msgid "Create new post"
 msgstr "Kurti naują pranešimą"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Nuo"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Tema"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1263,77 +1360,58 @@ msgstr ""
 "Jei planuojate daryti daug trynimų, įsitikinkite, kad Gajim yra išjungtas. "
 "Stengitės netrinti iš asmenų su kuriais dabar bendraujate."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim Istorijos Žurnalų Valdymas"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Trinti"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Eksportuoti"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Istorijos Žurnalų Valdymas"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Paieška duomenų bazėje"
 
-#: ../data/glade/history_window.glade.h:1
-#, fuzzy
-msgid "<b>History Viewer</b>"
-msgstr "<b>Taisyklių sąrašas</b>"
-
-#: ../data/glade/history_window.glade.h:2
-#, fuzzy
-msgid "<b>JID Selection</b>"
-msgstr "<b>Aprašymas</b>"
-
-#: ../data/glade/history_window.glade.h:3
-msgid "Build custom query"
-msgstr "Kurti kitokią užklausą"
-
-#: ../data/glade/history_window.glade.h:4 ../src/history_window.py:199
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Pokalbio istorija"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:2
 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"
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
 msgstr ""
 
-#: ../data/glade/history_window.glade.h:8
-msgid "Query Builder..."
-msgstr "Užklasų kūrimas..."
-
-#: ../data/glade/history_window.glade.h:9
-msgid "Search"
+#: ../data/glade/history_window.glade.h:5
+#, fuzzy
+msgid "Search:"
 msgstr "Ieškoti"
 
-#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/history_window.glade.h:6
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istoriją"
 
-#: ../data/glade/history_window.glade.h:11 ../src/disco.py:1172
-msgid "_Search"
-msgstr "_Ieškoti"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Priimti"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Atmesti"
-
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Gautas pakvietimas"
-
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1265
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
@@ -1343,8 +1421,6 @@ msgstr "Prisijungti prie šio kambario automatiškai."
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Slapyvardis:"
 
@@ -1362,8 +1438,8 @@ msgstr "Nesenai:"
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1160
-#: ../src/disco.py:1615
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Jungtis"
 
@@ -1399,6 +1475,21 @@ msgstr "Serveris:"
 msgid "Title:"
 msgstr "Antraštė:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Kambario nustatymai"
+
+#: ../data/glade/manage_pep_services_window.glade.h:2
+#, fuzzy
+msgid "_Configure"
+msgstr "_Tęsti"
+
+#: ../data/glade/manage_pep_services_window.glade.h:3
+#, fuzzy
+msgid "gtk-delete"
+msgstr "Trinti"
+
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Savybės</b>"
@@ -1419,8 +1510,6 @@ msgid "Manage Proxy Profiles"
 msgstr "Proxi profilių valdymas"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Pavadinimas:"
 
@@ -1441,24 +1530,52 @@ msgid "_Host:"
 msgstr "_Hostas:"
 
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Įterpti emocijų paveiksliuką (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adds contact to roster"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1213
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Šifravimas"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Veiksmai"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+msgid "Change your nickname (Ctrl+N)"
+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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "is paying attention to the conversation"
+
+#: ../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 "Įterpti emocijų paveiksliuką (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:243
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Siųsti"
 
@@ -1476,49 +1593,75 @@ msgstr "<b>Programos</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
 #, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Veiksmai</b>"
+
+#: ../data/glade/preferences_window.glade.h:4
+#, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Edit a rule</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:5
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Pokalbių būklės žymių spalvos</b>"
+
+#: ../data/glade/preferences_window.glade.h:6
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Vizualinis informavimas</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Custom</b>"
 msgstr "<b>Kitaip</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
-msgid "<b>Format of a line</b>"
-msgstr "<b>Eilutės formatas</b>"
+#: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Garsai</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
+#: ../data/glade/preferences_window.glade.h:10
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail nustatymai</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Nustatytosios būklės žinutės</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:13
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatus Sąrašas</i>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Nustatytosios būklės žinutės</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Savybės</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualinis informavimas</b>"
 
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Išplėstinis"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Išplėstinis"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1528,47 +1671,26 @@ msgstr ""
 "Tik rąšant\n"
 "Uždrausta"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Leisti siųsti informaciją apie _OS"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:25
 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:21
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr "Startuojant visada tikrinti ar Gajim yra pagrindinis Jabber klientas"
-
-#: ../data/glade/preferences_window.glade.h:22
-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 will "
-"use the default one set here"
-msgstr ""
-"Pavyzdys: Jei esate nustatęs žinutę būklei - nuėjęs, Gajim daugiau neklaus "
-"kokią žinutę naudoti, kai nustatoma būklė - nuėjęs; bus naudojama "
-"standartinė arba čia nustatyta žinutė"
-
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
-#: ../data/glade/preferences_window.glade.h:24
-msgid "Auto _away after:"
-msgstr "Automatiškai keisti būklė į nuėjęs, po:"
-
-#: ../data/glade/preferences_window.glade.h:25
-msgid "Auto _not available after:"
-msgstr "Automatiškai keisti būklę į nepasiekamas, po:"
-
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Automatiškai aptikti, startuojant Gajim\n"
@@ -1577,55 +1699,57 @@ msgstr ""
 "Visada naudoti XFCE4 programas pagal nutylėjimą\n"
 "Kita"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
-msgstr ""
-"Pažymėkite šį laukelį, tik jei kas nors, kas nėra jūsų kantaktų sąraše rašo "
-"jums nepageidaujamas žinutes. Naudokite atsargiai, nes šis dalykas blokuos "
-"vias žinutes, siunčiamas iš žmonių, kurie nėra Jūsų kontaktų sąraše."
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Configure color and font of the interface"
-msgstr "Nustatyti sąsajos spalvą ir šriftą"
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Būklės pranešimas:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "Būklės žinutė, pagal nutylėjimą"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Startuojant visada tikrinti ar Gajim yra pagrindinis Jabber klientas"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Nustatyti sąsajos spalvą ir šriftą"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Aptinkamas pagal siuntėją\n"
-"Pokalbio žinutė\n"
-"Atskira žinutė"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "Rodyti papildomus _el. pašto duomenis"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display a_vatars of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+
+#: ../data/glade/preferences_window.glade.h:45
 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:40
-msgid "Emoticons:"
-msgstr "Rožiukai:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Įvykiai"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1635,7 +1759,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:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1645,7 +1769,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:44
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1653,19 +1777,37 @@ msgstr ""
 "Gajim rodys pranešimus apie ką tik atsijungusius asmenis iššokančiame "
 "langelyje, dešiniajame apatiniame ekrano kampe"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
-msgid "Hides buttons in chatwindows to "
+msgid "Hide all buttons in chat windows"
 msgstr "Hides the buttons in group chat window."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
+
+#: ../data/glade/preferences_window.glade.h:52
 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:48
+#: ../data/glade/preferences_window.glade.h:53
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1673,7 +1815,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1681,7 +1823,64 @@ 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:50
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
+"lange"
+
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
+"lange"
+
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
+"lange"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Pažymėkite šį laukelį, tik jei kas nors, kas nėra jūsų kantaktų sąraše rašo "
+"jums nepageidaujamas žinutes. Naudokite atsargiai, nes šis dalykas blokuos "
+"vias žinutes, siunčiamas iš žmonių, kurie nėra Jūsų kontaktų sąraše."
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
+
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1691,7 +1890,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:51
+#: ../data/glade/preferences_window.glade.h:65
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1699,73 +1904,67 @@ 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:52
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignoruoti formatuotą turinį ateinančioms žinutėms"
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Log _encrypted chat session"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:68
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Vienas žinučių langas:"
+
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Val_dyti..."
 
-#: ../data/glade/preferences_window.glade.h:54
-msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
-msgstr ""
-"Niekada\n"
-"Visada\n"
-"Kiekvienam asmeniui\n"
-"Kiekvienam tipui"
+#: ../data/glade/preferences_window.glade.h:70
+#, fuzzy
+msgid "Notifications"
+msgstr "Prieigos keitimas"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:71
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Pranešk man apie asmenius, kurie: "
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:72
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Pranešk man apie asmenius, kurie: "
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Pranešk apie naujus _GMail laiškus"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Asmeninė Informacija"
+
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Groti _garsus"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Parinktys"
 
-#: ../data/glade/preferences_window.glade.h:66
-#, fuzzy
-msgid "Privacy"
-msgstr "Privatus sąrašas"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Nustatyti būklės žinutę, atspindinčią grojamą _muzikinį takelį"
-
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Pr_isijungti"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Atsijungti"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1773,137 +1972,148 @@ 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:71
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Rūšiuoti kontaktus pagal būklę"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Būklė"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:85
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Būklės p_iktogramų rinkinys, pagal nutylėjimą:"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "Stalled"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:74
-msgid "The auto away status message"
-msgstr "Automatinio nuėjimo būklės pranešimas"
-
-#: ../data/glade/preferences_window.glade.h:75
-msgid "The auto not available status message"
-msgstr "Automatinio nebuvimo būklės žinutė"
-
-#: ../data/glade/preferences_window.glade.h:76
-msgid "Treat all incoming messages as:"
-msgstr "Laikyti visas įeinančias žinutes kaip:"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Use _transports iconsets"
-msgstr "Naudoti _pernašos paveiksliukus"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
-msgid "Use only one message _window:"
-msgstr "Vienas žinučių langas:"
+msgid "Use _transports icons"
+msgstr "Naudoti _pernašos paveiksliukus"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Naudoti sisteminius nustatymus"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Naujam įvykiui ivykus"
 
-#: ../data/glade/preferences_window.glade.h:81
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"Veikia su Thythmbox ir Muine grotuvais. Dėl informacijos apie kitus grotuvus "
-"apsilankykite svetainėje: http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-
-#: ../data/glade/preferences_window.glade.h:82
-msgid "_Advanced Notifications Control..."
-msgstr "_Išplėstinis Pranešimų Valdymas..."
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "Automatiškai keisti būklė į nuėjęs, po:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:95
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Rožiukai:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Failų menedžeris:"
 
-#: ../data/glade/preferences_window.glade.h:86
-msgid "_Font:"
-msgstr "Šri_ftas:"
-
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "Žymėti žodžius su _gramatine klaida"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:99
 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:89
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignoruoti formatuotą turinį ateinančioms žinutėms"
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Į_einanti žinutė:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_El. pašto programa:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
-msgid "_Make message windows compact"
-msgstr "Vienas žinučių langas:"
+msgid "_Not available after:"
+msgstr "Automatiškai keisti būklę į nepasiekamas, po:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "_Išeinanti žinutė:"
 
-#: ../data/glade/preferences_window.glade.h:95
-msgid "_Player:"
-msgstr "_Grotuvas:"
-
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Sort contacts by status"
-msgstr "_Rūšiuoti kontaktus pagal būklę"
-
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "_Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:100
-msgid "_URL:"
-msgstr "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Prisijungti prie pokalbio grupėje"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Not in roster"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutės"
 
@@ -1939,6 +2149,10 @@ msgstr "Visi"
 msgid "Allow"
 msgstr "Leisti"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Atmesti"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1947,7 +2161,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Tvarka:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2104
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
@@ -1987,139 +2201,177 @@ msgstr "informavimui mane, apie būklę"
 msgid "to view my status"
 msgstr "mano būklės peržiūrai"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Add a rule</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Apie"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Atvaizdas:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresas"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Gimtadienis:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Atvaizdas:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Kitaip</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Gimtadienis:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Kitaip</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Miestas:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Garsai</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Spauskia čia, kad įkeltum savo atvaizdą"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Skyrius:"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Kompanija:"
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "El. paštas:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Country:"
-msgstr "Šalis:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Papildomas adresas:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Department:"
-msgstr "Skyrius:"
+#. Family Name
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Pavardė:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:17
-msgid "Extra Address:"
-msgstr "Papildomas adresas:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "Name"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Family:"
-msgstr "Pavardė:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Format: YYYY-MM-DD"
-msgstr "Formatas: YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Asmeninė svetainė:"
 
+#. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:20
 #, fuzzy
-msgid "Full Name"
-msgstr "Name"
+msgid "<b>Middle:</b>"
+msgstr "<b>Add a rule</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Savybės</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:24
-msgid "Given:"
-msgstr "Vardas:"
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Slapyvardis:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Homepage:"
-msgstr "Asmeninė svetainė:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Tel. Nr.:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Sąlygos</b>"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
-msgid "Middle:"
-msgstr "Antras vardas:"
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Pašto kodas:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<i>Privatus Sąrašas</i>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Personal Info"
-msgstr "Asmeninė Informacija"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Garsai</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:35
-msgid "Phone No.:"
-msgstr "Tel. Nr.:"
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Nustatymai</b>"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Position:"
-msgstr "Padėtis:"
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Nustatymai</b>"
 
+#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Postal Code:"
-msgstr "Pašto kodas:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Garsai</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
 #: ../data/glade/vcard_information_window.glade.h:39
-msgid "Prefix:"
-msgstr "Kreipinys:"
+msgid "About"
+msgstr "Apie"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
-msgid "Role:"
-msgstr "Funkcija:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:42
-msgid "State:"
-msgstr "Valstija:"
+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:44
-msgid "Street:"
-msgstr "Gatvė:"
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formatas: YYYY-MM-DD"
 
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:48
-msgid "Suffix:"
-msgstr "Vardo sufiksas:"
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Asmeninė Informacija"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Darbas"
 
@@ -2135,13 +2387,10 @@ msgstr "Pašalinti prieigą, _tik iš Gajim"
 msgid "Remove account from Gajim and from _server"
 msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
-#. Remove
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-#: ../src/roster_window.py:2524 ../src/roster_window.py:2734
-#: ../src/roster_window.py:2870
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Trinti"
 
@@ -2166,145 +2415,198 @@ msgstr "Redaguoti _Grupes"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Vykdyti Komandą..."
 
+#. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2440
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2664 ../src/roster_window.py:2798
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Trinti"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Siųsti ži_nutę..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "Send _File..."
 msgstr "Siųsti _Failą"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Pradėti _Pokalbį"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Leisti jam/jai matyti mano būklę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2514 ../src/roster_window.py:2725
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Drausti jam/jai matyti mano būklę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Rename Contact"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:19
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Pervadinti"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:20
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Sutikimas"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-#: ../src/roster_window.py:2508 ../src/roster_window.py:2719
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr ""
 
-#: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "P_rieigos"
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "nine"
 
-#: ../data/glade/roster_window.glade.h:2
+#: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
 msgstr "_Įtraukti asmenį..."
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 #, fuzzy
 msgid "Fea_tures"
 msgstr "Serverio teikiamos paslaugos"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "Failų _Siuntimai"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Dažniausiai Užduodami Klausimai (prisijungus)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Pagalba tinkle"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profilis, At_vaizdas"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Rodyti _Pernašas"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Rodyk _Kontaktų Sąrašą"
+
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "Prieiga"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Veiksmai"
+
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1348
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Redaguoti"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_DUK"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Nustatymai"
 
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Išjungti"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Siųsti ži_nutę..."
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Rodinys"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Prašome luktelti, kol atsisiųs komandų sąrašas..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Ieškoti"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Įtraukti _Asmenį"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Asmens Informacija"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Ieškoti"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Eik"
@@ -2389,6 +2691,24 @@ msgstr "Sutikimo užklausimas"
 msgid "_Deny"
 msgstr "_Drausti"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID of the contact that you want to chat with"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise : select contacts"
+msgstr "Rodyti _Atsijungusius Asmenis"
+
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
 msgstr "Išjungti Garsus"
@@ -2414,56 +2734,65 @@ msgid "_Group Chat"
 msgstr "Pokalbiai _Grupėje"
 
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Ask:"
-msgstr "Klausti:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Veiksmai</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Klientas:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Kitaip</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Šaltinis:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Nustatymai</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Aprašymas</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Kitaip</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Komentarai"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Keisti kambario nustatymus"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Asmuo"
 
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Asmens Informacija"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "More"
 msgstr "Daugiau"
 
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Šaltinis:"
-
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Būklė:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "Subscription:"
-msgstr "Sutikimas:"
-
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Atvaizdas:"
@@ -2504,13 +2833,13 @@ msgstr "Priskirti Open_PGP Raktą"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Redaguoti _Grupes"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:2854
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Pervadinti"
 
@@ -2526,275 +2855,409 @@ msgstr "Vietinis jid:"
 msgid "Personal"
 msgstr "Asmeninis"
 
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Šaltinis:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Būklė:"
+
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Keisti Prieigą"
 
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Asmens Informacija"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(None)"
 
-#. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Hidden"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:55
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:283
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:306 ../src/chat_control.py:512
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:307 ../src/chat_control.py:513
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1139
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Encryption enabled"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Not in Roster"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" by %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1227
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Encryption disabled"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Naudoti autentifikaciją"
 
-#: ../src/chat_control.py:1266 ../src/groupchat_control.py:1392
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Naudoti autentifikaciją"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
+
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
 
-#: ../src/chat_control.py:1273 ../src/groupchat_control.py:1415
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Commands: %s"
 
-#: ../src/chat_control.py:1276 ../src/groupchat_control.py:1429
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage: /%s, clears the text window."
 
-#: ../src/chat_control.py:1279 ../src/groupchat_control.py:1434
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/chat_control.py:1282 ../src/groupchat_control.py:1450
-#, python-format
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
 msgstr ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
 "person. (e.g. /%s explodes.)"
 
-#: ../src/chat_control.py:1286
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1289
+#: ../src/chat_control.py:1666
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/chat_control.py:1292 ../src/groupchat_control.py:1473
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "No help info for /%s"
 
-#: ../src/chat_control.py:1430 ../src/chat_control.py:1456
-msgid "Encryption enabled"
-msgstr "Encryption enabled"
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
 
-#: ../src/chat_control.py:1435
-msgid "Session WILL be logged"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[This message is encrypted]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1437
-msgid "Session WILL NOT be logged"
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1444
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
+msgstr "Encryption disabled"
+
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[This message is encrypted]"
 
-#: ../src/chat_control.py:1448 ../src/chat_control.py:1461
-#: ../src/chat_control.py:2090
-msgid "Encryption disabled"
-msgstr "Encryption disabled"
-
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1618 ../src/conversation_textview.py:562
-#: ../src/dialogs.py:674 ../src/gajim.py:894 ../src/gajim.py:895
-#: ../src/gajim.py:1364 ../src/roster_window.py:345
-#: ../src/roster_window.py:429 ../src/roster_window.py:1790
-#: ../src/roster_window.py:1800 ../src/roster_window.py:2039
-#: ../src/roster_window.py:2277 ../src/roster_window.py:3125
-#: ../src/roster_window.py:3332 ../src/roster_window.py:4692
-#: ../src/roster_window.py:4694 ../src/common/contacts.py:84
-#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
-msgid "Not in Roster"
-msgstr "Not in Roster"
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[This message is encrypted]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1762
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:1763
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2802,24 +3265,2588 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/config.py:122 ../src/config.py:544
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "creating logs database"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s is a file but it should be a directory"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim will now exit"
+
+#: ../src/common/check_paths.py:136
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s is a directory but should be a file"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "creating %s directory"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Change status information"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Change status"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Set the presence type and description"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Free for chat"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Online"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Extended away"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Do not disturb"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Offline - disconnect"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Presence description:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "The status has been changed."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Leave Groupchats"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s on %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "You have not joined a groupchat."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Choose the groupchats you want to leave"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Groupchats"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "You left the following groupchats:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr " %d unread message"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Use D-Bus and Notification-Daemon to show notifications"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Time in minutes, after which your status changes to away."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Away as a result of being idle"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Time in minutes, after which your status changes to not available."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Not available as a result of being idle"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Default"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Enable link-local/zeroconf messaging"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Language used by speller"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Treat * / _ pairs as possible formatting characters."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Characters that are printed before the nickname in conversations"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Characters that are printed after the nickname in conversations"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Add * and [n] in roster title?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "How many minutes should last lines from previous conversation last."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "How many lines to store for Ctrl+KeyUP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Ask before closing a group chat tab/window."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Notify of events in the system trayicon."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Show tab when only one conversation?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Show tabbed notebook border in chat windows?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Show close button in tab?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+
+#: ../src/common/config.py:219
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+
+#: ../src/common/config.py:229
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or status message."
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Background colour of contacts when they just signed in."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Background colour of contacts when they just signed out."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"If True, restored messages will use a smaller font than the default one."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Don't show avatar for the transport itself."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Don't show roster in the system taskbar."
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "If False, you will no longer see the avatar in the chat window."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "If True, pressing the escape key closes a tab/window."
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Hides the buttons in group chat window."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Hides the banner in a group chat window"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Hides the banner in two persons chat window"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Hides the group chat occupants list in group chat window."
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indentation when using merge consecutive nickname."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Išsiųsti žinutę ir uždaryti langą"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr "List of colours that will be used to colour nicknames in group chats."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab go to next composing tab when none is unread."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 workaround"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"If ticked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Is OpenPGP enabled for this contact?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Language for which we want to check misspelt words"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "all or space separated status"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no', or 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' or ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Sleeping"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Back soon"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Back in some minutes."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Eating"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "I'm eating, so leave me a message."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Movie"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "I'm watching a movie."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Working"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "I'm working."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Phone"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "I'm on the phone."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Out"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "I'm out enjoying life."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "I'm available."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "I'm free for chat."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Be right back."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "I'm not available."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Do not disturb."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Bye!"
+
+#: ../src/common/config.py:441
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Sound to play when any MUC message arrives."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "green"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "grocery"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "human"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marine"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Unable to load idle module"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Wrong host"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registration information for transport %s has not arrived in time"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Extension not supported"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nickname not allowed: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Unable to join group chat"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "You are banned from this group chat."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Such group chat does not exist."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Group chat creation is restricted."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Your registered nickname must be used."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "You are not in the members list."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Authorisation has been removed"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "I would like to add you to my roster."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "we are now subscribed to %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "unsubscribe request from %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "we are now unsubscribed from %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passphrase was not given"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Unable to load idle module"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Invalid username"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Connection with account \"%s\" has been lost"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Reconnect manually."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transport %s answered wrongly to register request: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Invalid answer"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transport %s answered wrongly to register request: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Check your connection or try again later."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Connection with account \"%s\" has been lost"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Check your connection or try again later"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Authentication failed with \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Please check your login and password for correctness."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Error while removing privacy list"
+
+#: ../src/common/connection.py:801
+#, fuzzy, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[This message is *encrypted* (See :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Subject: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Not fetched because of invisible status"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observers"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transports"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Not in roster"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindings are missing in this computer"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus capabilities of Gajim cannot be used"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Account name cannot be empty."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "one"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "two"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "three"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "four"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "five"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "six"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "seven"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "eight"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "nine"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "ten"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "eleven"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "twelve"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 o'clock"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "five past $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "ten past $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "quarter past $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "twenty past $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "twenty five past $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "half past $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "twenty five to $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "twenty to $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "quarter to $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "ten to $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "five to $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 o'clock"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Night"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Early morning"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Morning"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Almost noon"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Noon"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Afternoon"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Evening"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Late evening"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Start of week"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Middle of week"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "End of week"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Weekend!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Invalid character in username."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Server address required."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Invalid character in hostname."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Invalid character in resource."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Užimtas"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Užimtas"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Nepasiekiamas"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Laisvas Pokalbiams"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Laisvas Pokalbiams"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Prisijungęs"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Prisijungęs"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Jungiamasi"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Nuėjęs"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "A_tsijungęs"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Atsijungęs"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "N_ematomas"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Būklė nežinoma"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Būklė klaidinga"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Joks"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Kam"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Abu"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Joks"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "None"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderators"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderator"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Participants"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Participant"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Visitors"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Visitor"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "None"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Owner"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Member"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "is paying attention to the conversation"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "is doing something else"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "is composing a message..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "paused composing a message"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "has closed the chat window or tab"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Siųsti žinutę"
+msgstr[1] "Siųsti žinutę"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "error: cannot open %s for reading"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "migrating logs database to indices"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim account %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "sustabdytas"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Paryškintas"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Turiu "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Paryškintas"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Turinys"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Completed"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Turinys"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deactivated"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "uri"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Trinti"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Contact Disconnected"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Disabled"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Disabled"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Activated"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Group"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Hostas:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "message"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Activated"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Nematomas"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "one"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Hostas:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Keisti"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Atsijungęs"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Group"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "eleven"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Stalled"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Paskutinį kartą keista:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Nick"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Sleeping"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Gatvė:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Subscribed"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Time"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "nine"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Wrong host"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Evening"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Kuriama"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Morning"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "visus grupėje"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Working"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Evening"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Kicking %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Jungtis"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Working"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Working"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "room"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Eating"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Changing Subject"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Kicking %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Eating"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Working"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Kicking %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Eating"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Atsijungti"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Eating"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Reason"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Reason"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Sleeping"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Working"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Eating"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "I'm watching a movie."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Eating"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "I'm on the phone."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Transferring"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Kuriama"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Online"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Open as _Link"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Working"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Kuriama"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Working"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Unable to bind to port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Connection to host could not be established: Timeout while sending data."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"To continue sending and receiving messages, you will need to reconnect."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahi error"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-local messaging might not work properly."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Please check if Avahi is installed."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Could not start local service"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Unable to bind to port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Please check if avahi-daemon is running."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Could not change status of account \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[This message is encrypted]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Contact is offline. Your message could not be sent."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Contact is offline. Your message could not be sent."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Error while adding service. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:288
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:296
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:617 ../src/dialogs.py:958
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Būklės žinutė, pagal nutylėjimą"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Įjungti"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Kitaip</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:618
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2828,104 +5855,106 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:969
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:969
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "status message text"
 
-#: ../src/config.py:1005
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:1006
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Next Message Received"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Next Message Received"
 
-#: ../src/config.py:1007
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:1008
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:1010
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:1018
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
 #. Name column
-#: ../src/config.py:1287 ../src/dialogs.py:1397 ../src/dialogs.py:1461
-#: ../src/disco.py:736 ../src/disco.py:1559 ../src/disco.py:1805
-#: ../src/history_window.py:108
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1395 ../src/common/config.py:375
-msgid "Be right back."
-msgstr "Be right back."
-
-#: ../src/config.py:1399
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1406
 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:1495 ../src/config.py:1594
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1630 ../src/config.py:1674
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1631
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1660
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1694
 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:1670
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1671
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1675
+#: ../src/config.py:1710
 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:1681
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1682
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2933,145 +5962,145 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1686 ../src/config.py:1690
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1687
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1691
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1755
+#: ../src/config.py:1800
 #, fuzzy
 msgid "Rename Account"
 msgstr "Prieigų valdymas"
 
-#: ../src/config.py:1756
+#: ../src/config.py:1801
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/config.py:1774 ../src/config.py:1782 ../src/config.py:1822
-#: ../src/config.py:3048
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/config.py:1783
+#: ../src/config.py:1828
 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:1968 ../src/config.py:3119
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:1969 ../src/config.py:3120
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:1990
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:1994
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:1995
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2052
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2089
 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:2060 ../src/dialogs.py:1244 ../src/dialogs.py:1385
-#: ../src/dialogs.py:1565 ../src/disco.py:420 ../src/profile_window.py:325
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2061
+#: ../src/config.py:2097
 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:2065
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2066
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2097
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2098
+#: ../src/config.py:2134
 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:2274
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2276
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2312
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2364 ../src/disco.py:743 ../src/history_manager.py:155
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2372
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2381
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2406
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2408
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -3079,11 +6108,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -3091,11 +6120,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -3103,11 +6132,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2417
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -3115,7 +6144,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2418
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3131,84 +6160,84 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2522
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2539 ../src/gajim.py:1307 ../src/roster_window.py:3391
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2540 ../src/roster_window.py:3387
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2541 ../src/roster_window.py:3392
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2556
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2649
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2651
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2754
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
-#: ../src/config.py:3031
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3033
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Duplicate Jabber ID"
 
-#: ../src/config.py:3060
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "This account is already configured in Gajim."
 
-#: ../src/config.py:3077
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3078 ../src/config.py:3223
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3218,139 +6247,194 @@ msgstr ""
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3095
+#: ../src/config.py:3137
 #, fuzzy
 msgid "Invalid server"
 msgstr "Invalid username"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3138
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Please specify the new nickname you want to use:"
 
-#: ../src/config.py:3202 ../src/config.py:3241
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Contact already in roster"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3222
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3327
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3328
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/conversation_textview.py:337
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 
-#: ../src/conversation_textview.py:409
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:421
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:426
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:442
+#: ../src/conversation_textview.py:712
 #, 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:455
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:458
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:464
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:929
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:933
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:967
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dialogs.py:64
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM Klientas"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:66
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:223
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:323
+#: ../src/dialogs.py:461
+msgid "Set Mood"
+msgstr ""
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:325
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:425
-msgid "Save as Preset Status Message"
-msgstr "Save as Preset Status Message"
-
-#: ../src/dialogs.py:426
-msgid "Please type a name for this status message"
-msgstr "Please type a name for this status message"
-
-#: ../src/dialogs.py:437
+#: ../src/dialogs.py:672
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:438
+#: ../src/dialogs.py:673
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -3358,105 +6442,105 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:682
+msgid "Save as Preset Status Message"
+msgstr "Save as Preset Status Message"
+
+#: ../src/dialogs.py:683
+msgid "Please type a name for this status message"
+msgstr "Please type a name for this status message"
+
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:455
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:456
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:458
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:495
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:497
+#: ../src/dialogs.py:731
 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:654 ../src/dialogs.py:660
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:661
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "I would like to add you to my roster."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:676
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:775
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:776
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:790
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:792
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:1035
 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:821
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:951
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/dialogs.py:952
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-
-#: ../src/dialogs.py:959
+#: ../src/dialogs.py:1210
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -3467,82 +6551,93 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/dialogs.py:1173
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %s from %s"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1237 ../src/roster_window.py:763
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1245
+#: ../src/dialogs.py:1686
 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:1263
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
-#: ../src/groupchat_control.py:1643
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Invalid username"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:1334 ../src/dialogs.py:1340
-#: ../src/groupchat_control.py:1644
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:1346
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:1347
+#: ../src/dialogs.py:1795
 #, 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:1386
+#: ../src/dialogs.py:1822
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1433
+#: ../src/dialogs.py:1869
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/dialogs.py:1434
+#: ../src/dialogs.py:1870
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1458
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1516
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:1518
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:1519
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3551,286 +6646,377 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1544 ../src/dialogs.py:1891 ../src/dialogs.py:2027
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:1545 ../src/dialogs.py:1892 ../src/dialogs.py:2028
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:1554 ../src/dialogs.py:1557
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:1557
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:1566
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:1584
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:1590
+#: ../src/dialogs.py:2025
 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:1632 ../src/notify.py:219 ../src/notify.py:429
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:1634 ../src/notify.py:227 ../src/notify.py:431
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#: ../src/dialogs.py:1636 ../src/notify.py:250 ../src/notify.py:433
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:1636 ../src/notify.py:231 ../src/notify.py:433
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:1637 ../src/notify.py:238 ../src/notify.py:434
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:1637 ../src/gajim.py:1460 ../src/notify.py:442
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:1639 ../src/gajim.py:1668 ../src/notify.py:436
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:1641 ../src/gajim.py:1432 ../src/gajim.py:1644
-#: ../src/notify.py:438
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:1643 ../src/gajim.py:1707 ../src/gajim.py:1729
-#: ../src/gajim.py:1746 ../src/notify.py:440
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:1644 ../src/gajim.py:1710 ../src/notify.py:440
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:1646 ../src/gajim.py:1328 ../src/notify.py:444
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:1648 ../src/notify.py:211 ../src/notify.py:446
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:1821
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:1823
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1828
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, fuzzy, python-format
+msgid "Form %s"
+msgstr "I'm %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1928
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1929
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:1973
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:1975
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:2098
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2102
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:2158
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %s, action: %s, type: %s, value: %s"
 
-#: ../src/dialogs.py:2161
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %s, action: %s"
 
-#: ../src/dialogs.py:2203
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:2458
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:2459
+#: ../src/dialogs.py:2931
 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:2496
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "You have not joined a groupchat."
+
+#: ../src/dialogs.py:2966
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2978
+#, fuzzy
+msgid "Do you want to accept the invitation?"
+msgstr "%s wants to send you a file:"
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:2586 ../src/dialogs.py:2634
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:2591
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:2639
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:2705
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:2776
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2782
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:2900
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/disco.py:104
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Others"
 
-#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1345
-#: ../src/gajim.py:644 ../src/roster_window.py:282 ../src/roster_window.py:342
-#: ../src/roster_window.py:382 ../src/roster_window.py:490
-#: ../src/roster_window.py:522 ../src/roster_window.py:524
-#: ../src/roster_window.py:4688 ../src/roster_window.py:4690
-#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
-#: ../src/common/helpers.py:44
-msgid "Transports"
-msgstr "Transports"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:108
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:495
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:637
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:638
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3838,185 +7024,434 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:642 ../src/disco.py:923
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:662
 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:723
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Invalid username"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %s using account %s"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:924
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1142
+#: ../src/disco.py:1179
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykdyti komandą..."
 
-#: ../src/disco.py:1152 ../src/disco.py:1350
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1387
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1569
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1577
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1585
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1814
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:1822
+#: ../src/disco.py:1826
 #, fuzzy
 msgid "Node"
 msgstr "Joks"
 
-#: ../src/disco.py:1879
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1885
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1891
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "History Manager"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Message Sent"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Įjungti Open_PGP kodavimą"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Į_einanti žinutė:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Bendros parinktys"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Serverio teikiamos paslaugos"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Time"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:169 ../src/filetransfers_window.py:179
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:170
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:182
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:214
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "File transfer stopped by the contact at the other end"
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Description: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:254
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:291
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: ../src/filetransfers_window.py:294
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:769
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -4024,31 +7459,33 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
-#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:784
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:338
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Save File as..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:419
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -4056,69 +7493,69 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:508
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:551
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:763
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/gajim.py:143
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:147
+#: ../src/gajim.py:186
 #, fuzzy
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim needs PyGTK 2.6 or above"
 
-#: ../src/gajim.py:148
+#: ../src/gajim.py:187
 #, fuzzy
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 
-#: ../src/gajim.py:150
+#: ../src/gajim.py:189
 #, fuzzy
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim needs GTK 2.6 or above"
 
-#: ../src/gajim.py:151
+#: ../src/gajim.py:190
 #, fuzzy
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim needs GTK 2.6 or above to run. Quiting..."
 
-#: ../src/gajim.py:156
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime is missing libglade support"
 
-#: ../src/gajim.py:158
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -4127,21 +7564,21 @@ msgstr ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 
-#: ../src/gajim.py:160
+#: ../src/gajim.py:199
 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:165
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -4151,11 +7588,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:317
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:318
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -4163,291 +7600,391 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:341 ../src/common/connection_handlers.py:900
-#: ../src/common/connection_handlers.py:1601
-#: ../src/common/connection_handlers.py:1629
-#: ../src/common/connection_handlers.py:1639
-#: ../src/common/connection_handlers.py:1658
-#: ../src/common/connection_handlers.py:1889
-#: ../src/common/connection_handlers.py:2001 ../src/common/connection.py:925
-msgid "Disk Write Error"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Passphrase Required"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Enter GPG key passphrase for account %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Wrong Passphrase"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Please retype your GPG passphrase or press Cancel."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
 msgstr ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
 
-#: ../src/gajim.py:434
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gajim.py:437
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Do you accept this request?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Authorisation for %s (id: %s)"
 
-#: ../src/gajim.py:484 ../src/notify.py:448
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gajim.py:817
-#, python-format
-msgid "Subject: %s"
-msgstr "Subject: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:864 ../src/gajim.py:877
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %s ( %s )"
 
-#: ../src/gajim.py:910
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:911
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:919
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:920
-msgid "You will always see him or her as offline."
-msgstr "You will always see him or her as offline."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:964
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:965 ../src/common/connection.py:466
-msgid "Check your connection or try again later."
-msgstr "Check your connection or try again later."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s is now known as %s"
 
-#: ../src/gajim.py:1136 ../src/roster_window.py:1348
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s is now %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1139 ../src/groupchat_control.py:1101
-#: ../src/roster_window.py:1351
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s is now %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1259 ../src/groupchat_control.py:913
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1261
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1263
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1266
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_contol.py)
-#: ../src/gajim.py:1269
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1271
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1273
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1275
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1277
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1422
 #, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it"
+msgid "A Password is required to join the room %s. Please type it."
 msgstr "A password is required to join this group chat."
 
-#: ../src/gajim.py:1338
-msgid "Your passphrase is incorrect"
-msgstr "Your passphrase is incorrect"
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
 
-#: ../src/gajim.py:1339
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1443
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Your passphrase is incorrect"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1445
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1454
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"From: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1730
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1734
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1747
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1751
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1846
-msgid "Session negotiation cancelled"
-msgstr ""
-
-#: ../src/gajim.py:1847
-#, python-format
-msgid "The client at %s cancelled the session negotiation."
-msgstr ""
-
-#: ../src/gajim.py:1887 ../src/gajim.py:1928
-msgid "Confirm these session options"
-msgstr ""
-
-#: ../src/gajim.py:1888
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
-"\n"
-"\t%s\n"
-"\n"
-"\tAre these options acceptable?"
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1929
-#, python-format
-msgid ""
-"The remote client selected these options:\n"
-"\n"
-"%s\n"
-"\n"
-"Continue with the session?"
-msgstr ""
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "_Kiekvienai žinutei"
 
-#: ../src/gajim.py:2041
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:2042
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gajim.py:2059
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2067
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2098
+#: ../src/gajim.py:1960
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:2099
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Prisijungimas"
+
+#: ../src/gajim.py:2059
+#, 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 create a metacontact. Are you sure you want to continue?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "Do _not ask me again"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Encryption disabled"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "You cannot join a group chat while you are invisible"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2461
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#. sorted alphanum
-#: ../src/gajim.py:2596 ../src/common/config.py:86 ../src/common/config.py:395
-#: ../src/common/optparser.py:194 ../src/common/optparser.py:412
-#: ../src/common/optparser.py:446
-#, fuzzy
-msgid "default"
-msgstr "Default"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bookmark already set"
 
-#: ../src/gajim.py:2683
-msgid "Network Manager support not available"
-msgstr "Network Manager support not available"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/gajim.py:2784
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management support not available (missing gnome.ui module)"
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark has been added successfully"
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "You can manage your bookmarks via Actions menu in your roster."
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -4455,47 +7992,47 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4503,19 +8040,19 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:128
 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 "
@@ -4525,29 +8062,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141
 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 "
@@ -4557,135 +8094,135 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:157
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
-#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:205
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4693,35 +8230,72 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Kambarys:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Nickname not found: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Passwords do not match"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Please check if avahi-daemon is running."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Shows or hides the roster window"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4730,29 +8304,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:299
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:363
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:370
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:374
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4761,173 +8337,200 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:447
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Too many arguments. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:451
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:469
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
-#: ../src/gajim_themes_window.py:62
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Theme"
 
-#: ../src/gajim_themes_window.py:100
+#: ../src/gajim_themes_window.py:97
 #, fuzzy
 msgid "You cannot make changes to the default theme"
 msgstr "You cannot delete your current theme"
 
-#: ../src/gajim_themes_window.py:101
+#: ../src/gajim_themes_window.py:98
 msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:175
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "theme name"
 
-#: ../src/gajim_themes_window.py:192
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "You cannot delete your current theme"
 
-#: ../src/gajim_themes_window.py:193
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:134
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:136
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%s\" or \"%s\" has left."
 
-#: ../src/groupchat_control.py:342
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Pokalbio istorija"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Prisijungimas"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:916
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:918
+#: ../src/groupchat_control.py:1129
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Your new account has been successfully created"
 
-#: ../src/groupchat_control.py:921
+#: ../src/groupchat_control.py:1132
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:931
+#: ../src/groupchat_control.py:1142
 #, 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:938
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#. Someone changed his or her nick
-#. We changed our nick
-#: ../src/groupchat_control.py:949
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:951
-#, python-format
-msgid "%s is now known as %s"
-msgstr "%s is now known as %s"
-
-#: ../src/groupchat_control.py:984 ../src/groupchat_control.py:988
-#: ../src/groupchat_control.py:993
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:985
+#: ../src/groupchat_control.py:1201
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Affiliation:"
 
-#: ../src/groupchat_control.py:990
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:995
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1094
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s has been kicked: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1099
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1491
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Invalid username"
 
-#: ../src/groupchat_control.py:1213 ../src/groupchat_control.py:1492
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "The group chat Jabber ID has invalid characters."
-
-#: ../src/groupchat_control.py:1236 ../src/groupchat_control.py:1254
-#: ../src/groupchat_control.py:1338 ../src/groupchat_control.py:1355
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname not found: %s"
 
-#: ../src/groupchat_control.py:1270
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "This group chat has no subject"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4940,7 +8543,7 @@ msgstr ""
 "the JID is currently in the group chat, he/she/it will also be kicked. Does "
 "NOT support spaces in nickname."
 
-#: ../src/groupchat_control.py:1425
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4949,7 +8552,7 @@ msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: ../src/groupchat_control.py:1431
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4958,7 +8561,7 @@ msgstr ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4967,7 +8570,7 @@ msgstr ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 
-#: ../src/groupchat_control.py:1441
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4976,7 +8579,7 @@ msgstr ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 
-#: ../src/groupchat_control.py:1445
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4987,7 +8590,7 @@ msgstr ""
 "from the group chat and optionally displays a reason. Does NOT support "
 "spaces in nickname."
 
-#: ../src/groupchat_control.py:1454
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4996,113 +8599,92 @@ msgstr ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 
-#: ../src/groupchat_control.py:1459
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: ../src/groupchat_control.py:1463
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: ../src/groupchat_control.py:1467
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 
-#: ../src/groupchat_control.py:1565
+#: ../src/groupchat_control.py:1837
 #, 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:1567
+#: ../src/groupchat_control.py:1839
 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:1571 ../src/roster_window.py:4836
-msgid "Do _not ask me again"
-msgstr "Do _not ask me again"
-
-#: ../src/groupchat_control.py:1605
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1606
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1615
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1616
+#: ../src/groupchat_control.py:1882
 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:1631
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Description: %s"
 
-#: ../src/groupchat_control.py:1632
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1634
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1665
-msgid "Bookmark already set"
-msgstr "Bookmark already set"
-
-#: ../src/groupchat_control.py:1666
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Group Chat \"%s\" is already in your bookmarks."
-
-#: ../src/groupchat_control.py:1675
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark has been added successfully"
-
-#: ../src/groupchat_control.py:1676
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "You can manage your bookmarks via Actions menu in your roster."
-
 #. ask for reason
-#: ../src/groupchat_control.py:1828
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:1829 ../src/groupchat_control.py:2129
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2128
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "A programming error has been detected"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -5110,88 +8692,88 @@ msgstr ""
 "It is probably not fatal, but should be reported to the developers "
 "nonetheless."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:157 ../src/gtkgui_helpers.py:172
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: ../src/gtkgui_helpers.py:337
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:340
+#: ../src/gtkgui_helpers.py:359
 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:377
+#: ../src/gtkgui_helpers.py:396
 #, 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:711
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:712
+#: ../src/gtkgui_helpers.py:734
 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:713
+#: ../src/gtkgui_helpers.py:735
 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:812
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../src/gtkgui_helpers.py:813
+#: ../src/gtkgui_helpers.py:805
 #, 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:822
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
-#: ../src/history_manager.py:68
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:116
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:124
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Message"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -5199,7 +8781,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: ../src/history_manager.py:189
+#: ../src/history_manager.py:226
 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 "
@@ -5213,168 +8795,175 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: ../src/history_window.py:185 ../src/history_window.py:187
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
 #: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:336 ../src/notify.py:206
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s is now %(status)s"
-
-#: ../src/history_window.py:342
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:345
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Could not load image"
 
-#: ../src/htmltextview.py:604
+#: ../src/htmltextview.py:612
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:288
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:290
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:292
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:294
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/message_window.py:295
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:204
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:222
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: ../src/notify.py:244
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:247
+#: ../src/notify.py:273
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/notify.py:253
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Bendros parinktys"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:123 ../src/roster_window.py:1882
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 #, fuzzy
 msgid "File is empty"
 msgstr "File path"
 
-#: ../src/profile_window.py:126 ../src/roster_window.py:1885
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 #, fuzzy
 msgid "File does not exist"
 msgstr "Such group chat does not exist."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:140 ../src/profile_window.py:156
-#: ../src/roster_window.py:1887 ../src/roster_window.py:1898
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:257
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: ../src/profile_window.py:338
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:360
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:361
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -5382,93 +8971,89 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:182 ../src/roster_window.py:237
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:357 ../src/roster_window.py:622
-#: ../src/roster_window.py:2110 ../src/common/contacts.py:307
-#: ../src/common/helpers.py:44
-msgid "Observers"
-msgstr "Observers"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Authorisation has been sent"
 
-#. Make special context menu if group is Groupchats
-#: ../src/roster_window.py:441 ../src/roster_window.py:446
-#: ../src/roster_window.py:1935 ../src/roster_window.py:1938
-#: ../src/roster_window.py:2607 ../src/roster_window.py:2610
-#: ../src/roster_window.py:2635 ../src/roster_window.py:4696
-#: ../src/roster_window.py:4698 ../src/common/commands.py:194
-#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
-msgid "Groupchats"
-msgstr "Groupchats"
+#: ../src/roster_window.py:1861
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:771 ../src/roster_window.py:3952
-msgid "You cannot join a group chat while you are invisible"
-msgstr "You cannot join a group chat while you are invisible"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Subscription request has been sent"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py:984 ../src/roster_window.py:994
-#: ../src/roster_window.py:1003 ../src/systray.py:207 ../src/systray.py:212
-#: ../src/systray.py:218
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using account %s"
-msgstr "using account %s"
+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."
 
-#. add
-#: ../src/roster_window.py:1010
-#, python-format
-msgid "to %s account"
-msgstr "to %s account"
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Authorisation has been removed"
 
-#. disco
-#: ../src/roster_window.py:1015
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "using %s account"
-msgstr "using %s account"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1096
-msgid "_Manage Bookmarks..."
-msgstr "_Manage Bookmarks..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomekeyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 
-#. profile, avatar
-#: ../src/roster_window.py:1115
-#, python-format
-msgid "of account %s"
-msgstr "of account %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#: ../src/roster_window.py:1155
-#, python-format
-msgid "for account %s"
-msgstr "for account %s"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "You are participating in one or more group chats"
 
-#. History manager
-#: ../src/roster_window.py:1176
-msgid "History Manager"
-msgstr "History Manager"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:1185
-msgid "_Join New Group Chat"
-msgstr "_Join New Group Chat"
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1544 ../src/roster_window.py:4150
-#: ../src/roster_window.py:4157
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:1548
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:1549
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5476,176 +9061,66 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:1552
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:1557
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1723
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:1724
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:1732
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:1807
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:1808
+#: ../src/roster_window.py:2734
 #, 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:1809
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove also all contacts in this group from your roster"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:1841
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:2156
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "New Group Chat"
-
-#: ../src/roster_window.py:2298
-msgid "I would like to add you to my roster"
-msgstr "I would like to add you to my roster"
-
-#. Send Group Message
-#: ../src/roster_window.py:2432 ../src/roster_window.py:2644
-msgid "Send Group M_essage"
-msgstr "Send Group M_essage"
-
-#: ../src/roster_window.py:2451
-msgid "_New group chat"
-msgstr "_New group chat"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:2489
-#, fuzzy
-msgid "_Manage Contacts"
-msgstr "Rename Contact"
-
-#: ../src/roster_window.py:2550
-msgid "_Maximize"
-msgstr ""
-
-#: ../src/roster_window.py:2557
-#, fuzzy
-msgid "_Disconnect"
-msgstr "Contact Disconnected"
-
-#: ../src/roster_window.py:2636
-msgid "_Maximize All"
-msgstr ""
-
-#: ../src/roster_window.py:2652
-msgid "To all users"
-msgstr "Visiems"
-
-#: ../src/roster_window.py:2655
-msgid "To all online users"
-msgstr "Visiems prisijungusiems"
-
-#. Log Off
-#: ../src/roster_window.py:2772
-#, fuzzy
-msgid "_Log off"
-msgstr "_Atsijungti"
-
-#. Log on
-#: ../src/roster_window.py:2778
-msgid "_Log on"
-msgstr "_Prisijungti"
-
-#. Send single message
-#: ../src/roster_window.py:2790
-#, fuzzy
-msgid "Send Single Message"
-msgstr "_Siųsti vieną žinutę"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:2837
-#, fuzzy
-msgid "_Manage Transport"
-msgstr "Transports"
-
-#. Modify Transport
-#: ../src/roster_window.py:2845
-#, fuzzy
-msgid "_Modify Transport"
-msgstr "Rodyti _Pernašas"
-
-#. Information
-#: ../src/roster_window.py:2882
-#, fuzzy
-msgid "_Information"
-msgstr "Asmens Informacija"
-
-#: ../src/roster_window.py:2959 ../src/roster_window.py:3033
-msgid "_Change Status Message"
-msgstr "_Keisti Būklės Žinutę"
-
-#: ../src/roster_window.py:3105
-msgid "Authorization has been sent"
-msgstr "Authorisation has been sent"
-
-#: ../src/roster_window.py:3106
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Dabar \"%s\" žinos apie jūsų būklę."
-
-#: ../src/roster_window.py:3126
-msgid "Subscription request has been sent"
-msgstr "Subscription request has been sent"
-
-#: ../src/roster_window.py:3127
-#, 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:3139
-msgid "Authorization has been removed"
-msgstr "Authorisation has been removed"
-
-#: ../src/roster_window.py:3140
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Now \"%s\" will always see you as offline."
-
-#: ../src/roster_window.py:3338
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3342
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5653,7 +9128,13 @@ msgstr ""
 "By removing this contact you also remove authorisation resulting in him or "
 "her always seeing you as offline."
 
-#: ../src/roster_window.py:3347
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "What do you want to do?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5661,16 +9142,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:3350
+#: ../src/roster_window.py:3144
 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:3354
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3358
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5679,85 +9160,19 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3390
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-msgstr ""
-"Gnomekeyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-
-#: ../src/roster_window.py:3417
-msgid "GPG is not usable"
-msgstr ""
-
-#. %s is the account name here
-#: ../src/roster_window.py:3417 ../src/common/connection.py:684
-#: ../src/common/zeroconf/connection_zeroconf.py:165
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#: ../src/roster_window.py:3434
-msgid "Passphrase Required"
-msgstr "Passphrase Required"
-
-#: ../src/roster_window.py:3435
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Enter GPG key passphrase for account %s."
-
-#: ../src/roster_window.py:3440
-msgid "Save passphrase"
-msgstr "Save passphrase"
-
-#: ../src/roster_window.py:3448
-msgid "Wrong Passphrase"
-msgstr "Wrong Passphrase"
-
-#: ../src/roster_window.py:3449
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Please retype your GPG passphrase or press Cancel."
-
-#: ../src/roster_window.py:3532 ../src/roster_window.py:3609
-msgid "You are participating in one or more group chats"
-msgstr "You are participating in one or more group chats"
-
-#: ../src/roster_window.py:3533 ../src/roster_window.py:3610
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-
-#: ../src/roster_window.py:3567
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3568
+#: ../src/roster_window.py:3192
 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:3696
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" by %(artist)s"
-
-#: ../src/roster_window.py:4151 ../src/roster_window.py:4158
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-
-#: ../src/roster_window.py:4782
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:4784
+#: ../src/roster_window.py:3710
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -5766,13 +9181,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:4830
+#: ../src/roster_window.py:3784
 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:4832
+#: ../src/roster_window.py:3786
 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 "
@@ -5782,125 +9197,321 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4930
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Invalid File"
+
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
-msgid "Do you want to send that file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid "Do you want to send this file to %s:"
+msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s wants to send you a file:"
 msgstr[1] "%s wants to send you a file:"
 
-#: ../src/roster_window.py:5212
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "using account %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "to %s account"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "using %s account"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Manage Bookmarks..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "of account %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "for account %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Keisti Būklės Žinutę"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publish"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Active"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "Keisti kambario nustatymus"
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Send Group M_essage"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Visiems"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Visiems prisijungusiems"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "I would like to add you to my roster"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Rename Contact"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Siųsti vieną žinutę"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transports"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Rodyti _Pernašas"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contact Disconnected"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "New Group Chat"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "History Manager"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Join New Group Chat"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
-#: ../src/systray.py:164
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Subject: %s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/systray.py:249
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:310 ../src/tooltips.py:503
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:313 ../src/tooltips.py:507
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:318
+#: ../src/tooltips.py:335
 #, 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:416
+#: ../src/tooltips.py:432
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:436
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:435 ../src/tooltips.py:623
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:465
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:467
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:485
+#: ../src/tooltips.py:501
 #, fuzzy
 msgid "Connected"
 msgstr "Prisijungimas"
 
-#: ../src/tooltips.py:487
+#: ../src/tooltips.py:503
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contact Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:514
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Kambarys:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Activated"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipas:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:598
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:601 ../src/tooltips.py:622
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:607 ../src/tooltips.py:610
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:614
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:652
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: ../src/tooltips.py:655
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5908,24 +9519,25 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:240
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:242
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:306
-msgid "Affiliation:"
-msgstr "Affiliation:"
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Programos</b>"
 
-#: ../src/vcard.py:314
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5933,7 +9545,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:316
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5941,13 +9553,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:318
+#: ../src/vcard.py:323
 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:320
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5955,1462 +9567,252 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:332
 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:332 ../src/vcard.py:369 ../src/vcard.py:492
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
+msgstr ""
+
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "creating logs database"
-
-#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
-#: ../src/common/check_paths.py:114
-#, 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:97 ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
-msgid "Gajim will now exit"
-msgstr "Gajim will now exit"
-
-#: ../src/common/check_paths.py:122
-#, 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:138
-#, python-format
-msgid "creating %s directory"
-msgstr "creating %s directory"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Change status information"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Change status"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Set the presence type and description"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Free for chat"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Online"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Extended away"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Do not disturb"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP Šifravimas"
 
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Offline - disconnect"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
 
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Presence description:"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "No such command: /%s (if you want to send this, prefix it with /say)"
 
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "The status has been changed."
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
 
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s on %(room_jid)s"
+#~ msgid "Encryption enabled"
+#~ msgstr "Encryption enabled"
 
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "You have not joined a groupchat."
+#~ msgid "Encryption disabled"
+#~ msgstr "Encryption disabled"
 
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Leave Groupchats"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Spauskite, kad pamatytumėte buvusius pokalbius su šiuo asmeniu"
 
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Choose the groupchats you want to leave"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Spauskite, kad pamatytumėte buvusius pokalbius šiame kambaryje"
 
-#: ../src/common/commands.py:230
 #, fuzzy
-msgid "You left the following groupchats:"
-msgstr "You left the following groupchats:"
+#~ msgid "<b>History Viewer</b>"
+#~ msgstr "<b>Taisyklių sąrašas</b>"
 
-#: ../src/common/commands.py:242
 #, fuzzy
-msgid "Forward unread messages"
-msgstr " %d unread message"
-
-#: ../src/common/commands.py:262
-msgid "All unread messages have been forwarded."
-msgstr ""
-
-#: ../src/common/config.py:58
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Use D-Bus and Notification-Daemon to show notifications"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Time in minutes, after which your status changes to away."
-
-#: ../src/common/config.py:64
-msgid "Away as a result of being idle"
-msgstr "Away as a result of being idle"
-
-#: ../src/common/config.py:66
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Time in minutes, after which your status changes to not available."
+#~ msgid "<b>JID Selection</b>"
+#~ msgstr "<b>Aprašymas</b>"
 
-#: ../src/common/config.py:67
-msgid "Not available as a result of being idle"
-msgstr "Not available as a result of being idle"
-
-#: ../src/common/config.py:85
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+#~ msgid "Build custom query"
+#~ msgstr "Kurti kitokią užklausą"
 
-#: ../src/common/config.py:90
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Enable link-local/zeroconf messaging"
-
-#: ../src/common/config.py:93
-msgid "Language used by speller"
-msgstr "Language used by speller"
-
-#: ../src/common/config.py:94
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
+#~ msgid "Query Builder..."
+#~ msgstr "Užklasų kūrimas..."
 
-#: ../src/common/config.py:95
-msgid ""
-"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+#~ msgid "Accept"
+#~ msgstr "Priimti"
 
-#: ../src/common/config.py:98
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Treat * / _ pairs as possible formatting characters."
+#~ msgid "Invitation Received"
+#~ msgstr "Gautas pakvietimas"
 
-#: ../src/common/config.py:99
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Eilutės formatas</b>"
 
-#: ../src/common/config.py:102
-msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
-
-#: ../src/common/config.py:111
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-
-#: ../src/common/config.py:112
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-
-#: ../src/common/config.py:135
-msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr ""
-"This option let you customize timestamp that is printed in conversation. For "
-"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-
-#: ../src/common/config.py:136
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Characters that are printed before the nickname in conversations"
-
-#: ../src/common/config.py:137
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Characters that are printed after the nickname in conversations"
-
-#: ../src/common/config.py:144
-msgid "Add * and [n] in roster title?"
-msgstr "Add * and [n] in roster title?"
-
-#: ../src/common/config.py:145
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-
-#: ../src/common/config.py:146
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "How many minutes should last lines from previous conversation last."
-
-#: ../src/common/config.py:147
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-
-#: ../src/common/config.py:149
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "How many lines to store for Ctrl+KeyUP."
-
-#: ../src/common/config.py:152
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-
-#: ../src/common/config.py:155
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
-
-#: ../src/common/config.py:156
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-
-#: ../src/common/config.py:157
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-
-#: ../src/common/config.py:158
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-
-#: ../src/common/config.py:160
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-
-#: ../src/common/config.py:161
-msgid "Ask before closing a group chat tab/window."
-msgstr "Ask before closing a group chat tab/window."
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Pavyzdys: Jei esate nustatęs žinutę būklei - nuėjęs, Gajim daugiau "
+#~ "neklaus kokią žinutę naudoti, kai nustatoma būklė - nuėjęs; bus naudojama "
+#~ "standartinė arba čia nustatyta žinutė"
 
-#: ../src/common/config.py:162
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Aptinkamas pagal siuntėją\n"
+#~ "Pokalbio žinutė\n"
+#~ "Atskira žinutė"
 
-#: ../src/common/config.py:163
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+#~ msgid "Events"
+#~ msgstr "Įvykiai"
 
-#: ../src/common/config.py:166
 #, fuzzy
-msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
-msgstr ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
+#~ msgid "Hides buttons in chatwindows to "
+#~ msgstr "Hides the buttons in group chat window."
 
-#: ../src/common/config.py:168
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:170
-msgid "Notify of events in the system trayicon."
-msgstr "Notify of events in the system trayicon."
-
-#: ../src/common/config.py:176
-msgid "Show tab when only one conversation?"
-msgstr "Show tab when only one conversation?"
-
-#: ../src/common/config.py:177
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Show tabbed notebook border in chat windows?"
-
-#: ../src/common/config.py:178
-msgid "Show close button in tab?"
-msgstr "Show close button in tab?"
-
-#: ../src/common/config.py:179
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:188
-msgid "Preview new messages in notification popup?"
-msgstr ""
-
-#: ../src/common/config.py:193
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-
-#: ../src/common/config.py:194
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-
-#: ../src/common/config.py:195
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-
-#: ../src/common/config.py:196
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-
-#: ../src/common/config.py:197
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-
-#: ../src/common/config.py:199
-msgid ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-msgstr ""
-"If True, Gajim will ask for avatar each contact that did not have an avatar "
-"last time or has one cached that is too old."
-
-#: ../src/common/config.py:200
-msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or his or her status message."
-msgstr ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or status message."
-
-#: ../src/common/config.py:201
-msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
-"group chat."
-msgstr ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
-"group chat."
-
-#: ../src/common/config.py:203
-msgid "Background color of contacts when they just signed in."
-msgstr "Background colour of contacts when they just signed in."
-
-#: ../src/common/config.py:204
-msgid "Background color of contacts when they just signed out."
-msgstr "Background colour of contacts when they just signed out."
-
-#: ../src/common/config.py:206
-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:207
-msgid "Don't show avatar for the transport itself."
-msgstr "Don't show avatar for the transport itself."
-
-#: ../src/common/config.py:208
-msgid "Don't show roster in the system taskbar."
-msgstr "Don't show roster in the system taskbar."
-
-#: ../src/common/config.py:209
-msgid ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
-msgstr ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
-
-#: ../src/common/config.py:211
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:214
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-
-#: ../src/common/config.py:215
-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:216
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr "If True, pressing the escape key closes a tab/window."
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Niekada\n"
+#~ "Visada\n"
+#~ "Kiekvienam asmeniui\n"
+#~ "Kiekvienam tipui"
 
-#: ../src/common/config.py:217
 #, fuzzy
-msgid "Hides the buttons in chat windows."
-msgstr "Hides the buttons in group chat window."
+#~ msgid "Privacy"
+#~ msgstr "Privatus sąrašas"
 
-#: ../src/common/config.py:218
-msgid "Hides the banner in a group chat window"
-msgstr "Hides the banner in a group chat window"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Nustatyti būklės žinutę, atspindinčią grojamą _muzikinį takelį"
 
-#: ../src/common/config.py:219
-msgid "Hides the banner in two persons chat window"
-msgstr "Hides the banner in two persons chat window"
+#~ msgid "The auto away status message"
+#~ msgstr "Automatinio nuėjimo būklės pranešimas"
 
-#: ../src/common/config.py:220
-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:221
-msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
-msgstr ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+#~ msgid "The auto not available status message"
+#~ msgstr "Automatinio nebuvimo būklės žinutė"
 
-#: ../src/common/config.py:222
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Indentation when using merge consecutive nickname."
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Laikyti visas įeinančias žinutes kaip:"
 
-#: ../src/common/config.py:223
 #, fuzzy
-msgid "Smooth scroll message in conversation window"
-msgstr "Išsiųsti žinutę ir uždaryti langą"
-
-#: ../src/common/config.py:224
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "List of colours that will be used to colour nicknames in group chats."
-
-#: ../src/common/config.py:225
-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:226
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
-
-#: ../src/common/config.py:227
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-
-#: ../src/common/config.py:228
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-
-#: ../src/common/config.py:229
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-
-#: ../src/common/config.py:230
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-msgstr ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-
-#: ../src/common/config.py:231
-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:232
-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:233
-msgid "Time of inactivity needed before the change status window closes down."
-msgstr ""
-
-#: ../src/common/config.py:234
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
-msgstr ""
-
-#: ../src/common/config.py:245
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#~ msgid "Use only one message _window:"
+#~ msgstr "Vienas žinučių langas:"
 
-#. yes, no, ask
-#: ../src/common/config.py:275
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 workaround"
-
-#: ../src/common/config.py:279
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"If ticked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-
-#: ../src/common/config.py:338
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Is OpenPGP enabled for this contact?"
-
-#: ../src/common/config.py:339 ../src/common/config.py:342
-msgid "Language for which we want to check misspelled words"
-msgstr "Language for which we want to check misspelt words"
-
-#: ../src/common/config.py:348
-msgid "all or space separated status"
-msgstr "all or space separated status"
-
-#: ../src/common/config.py:349
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', or 'both'"
-
-#: ../src/common/config.py:350 ../src/common/config.py:352
-#: ../src/common/config.py:353 ../src/common/config.py:356
-#: ../src/common/config.py:357
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' or ''"
-
-#: ../src/common/config.py:363
-msgid "Sleeping"
-msgstr "Sleeping"
-
-#: ../src/common/config.py:364
-msgid "Back soon"
-msgstr "Back soon"
-
-#: ../src/common/config.py:364
-msgid "Back in some minutes."
-msgstr "Back in some minutes."
-
-#: ../src/common/config.py:365
-msgid "Eating"
-msgstr "Eating"
-
-#: ../src/common/config.py:365
-msgid "I'm eating, so leave me a message."
-msgstr "I'm eating, so leave me a message."
-
-#: ../src/common/config.py:366
-msgid "Movie"
-msgstr "Movie"
-
-#: ../src/common/config.py:366
-msgid "I'm watching a movie."
-msgstr "I'm watching a movie."
-
-#: ../src/common/config.py:367
-msgid "Working"
-msgstr "Working"
-
-#: ../src/common/config.py:367
-msgid "I'm working."
-msgstr "I'm working."
-
-#: ../src/common/config.py:368
-msgid "Phone"
-msgstr "Phone"
-
-#: ../src/common/config.py:368
-msgid "I'm on the phone."
-msgstr "I'm on the phone."
-
-#: ../src/common/config.py:369
-msgid "Out"
-msgstr "Out"
-
-#: ../src/common/config.py:369
-msgid "I'm out enjoying life."
-msgstr "I'm out enjoying life."
-
-#: ../src/common/config.py:373
-msgid "I'm available."
-msgstr "I'm available."
-
-#: ../src/common/config.py:374
-msgid "I'm free for chat."
-msgstr "I'm free for chat."
-
-#: ../src/common/config.py:376
-msgid "I'm not available."
-msgstr "I'm not available."
-
-#: ../src/common/config.py:377
-msgid "Do not disturb."
-msgstr "Do not disturb."
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Veikia su Thythmbox ir Muine grotuvais. Dėl informacijos apie kitus "
+#~ "grotuvus apsilankykite svetainėje: http://trac.gajim.org/wiki/"
+#~ "GajimAndMusicPlayer"
 
-#: ../src/common/config.py:378 ../src/common/config.py:379
-msgid "Bye!"
-msgstr "Bye!"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Išplėstinis Pranešimų Valdymas..."
 
-#: ../src/common/config.py:388
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
-msgstr ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+#~ msgid "_Font:"
+#~ msgstr "Šri_ftas:"
 
-#: ../src/common/config.py:389
-msgid "Sound to play when any MUC message arrives."
-msgstr "Sound to play when any MUC message arrives."
+#~ msgid "_Player:"
+#~ msgstr "_Grotuvas:"
 
-#: ../src/common/config.py:398 ../src/common/optparser.py:208
-msgid "green"
-msgstr "green"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/config.py:402 ../src/common/optparser.py:194
-msgid "grocery"
-msgstr "grocery"
+#~ msgid "Address"
+#~ msgstr "Adresas"
 
-#: ../src/common/config.py:406
-msgid "human"
-msgstr "human"
+#~ msgid "City:"
+#~ msgstr "Miestas:"
 
-#: ../src/common/config.py:410
-msgid "marine"
-msgstr "marine"
+#~ msgid "Company:"
+#~ msgstr "Kompanija:"
 
-#: ../src/common/connection_handlers.py:56
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Unable to load idle module"
+#~ msgid "Country:"
+#~ msgstr "Šalis:"
 
-#: ../src/common/connection_handlers.py:184
-#: ../src/common/connection_handlers.py:219
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-msgid "Wrong host"
-msgstr "Wrong host"
+#~ msgid "Given:"
+#~ msgstr "Vardas:"
 
-#: ../src/common/connection_handlers.py:184
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
+#~ msgid "Middle:"
+#~ msgstr "Antras vardas:"
 
-#: ../src/common/connection_handlers.py:220
-msgid "Invalid local address? :-O"
-msgstr ""
+#~ msgid "Position:"
+#~ msgstr "Padėtis:"
 
-#: ../src/common/connection_handlers.py:612
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registration information for transport %s has not arrived in time"
+#~ msgid "Prefix:"
+#~ msgstr "Kreipinys:"
 
-#: ../src/common/connection_handlers.py:1776
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nickname not allowed: %s"
+#~ msgid "Role:"
+#~ msgstr "Funkcija:"
 
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1846
-#: ../src/common/connection_handlers.py:1849
-#: ../src/common/connection_handlers.py:1852
-#: ../src/common/connection_handlers.py:1855
-#: ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1868
-msgid "Unable to join group chat"
-msgstr "Unable to join group chat"
+#~ msgid "State:"
+#~ msgstr "Valstija:"
 
-#: ../src/common/connection_handlers.py:1847
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "You are banned from this group chat."
+#~ msgid "Suffix:"
+#~ msgstr "Vardo sufiksas:"
 
-#: ../src/common/connection_handlers.py:1850
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Such group chat does not exist."
+#~ msgid "A_ccounts"
+#~ msgstr "P_rieigos"
 
-#: ../src/common/connection_handlers.py:1853
-msgid "Group chat creation is restricted."
-msgstr "Group chat creation is restricted."
+#~ msgid "Ask:"
+#~ msgstr "Klausti:"
 
-#: ../src/common/connection_handlers.py:1856
-#, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Your registered nickname must be used."
+#~ msgid "Client:"
+#~ msgstr "Klientas:"
 
-#: ../src/common/connection_handlers.py:1860
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "You are not in the members list."
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/connection_handlers.py:1869
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#~ msgid "Subscription:"
+#~ msgstr "Sutikimas:"
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1900
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Authorisation has been removed"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "You will always see him or her as offline."
 
-#: ../src/common/connection_handlers.py:1907
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s is now %s (%s)"
 
-#: ../src/common/connection_handlers.py:1934
-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:1955
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we are now subscribed to %s"
+#~ msgid "%s is now %s"
+#~ msgstr "%s is now %s"
 
-#: ../src/common/connection_handlers.py:1957
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "unsubscribe request from %s"
-
-#: ../src/common/connection_handlers.py:1959
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we are now unsubscribed from %s"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "From: %(from_address)s"
 
-#: ../src/common/connection_handlers.py:2081
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Manager support not available"
 
-#: ../src/common/connection.py:244
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Connection with account \"%s\" has been lost"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Session Management support not available (missing gnome.ui module)"
 
-#: ../src/common/connection.py:245
-msgid "Reconnect manually."
-msgstr "Reconnect manually."
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/connection.py:256
-#, fuzzy, python-format
-msgid "Server %s answered wrongly to register request: %s"
-msgstr "Transport %s answered wrongly to register request: %s"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#. wrong answer
-#: ../src/common/connection.py:264
-msgid "Invalid answer"
-msgstr "Invalid answer"
+#~ msgid "_New group chat"
+#~ msgstr "_New group chat"
 
-#: ../src/common/connection.py:265
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transport %s answered wrongly to register request: %s"
-
-#: ../src/common/connection.py:411
 #, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Connection Failed"
-
-#: ../src/common/connection.py:465 ../src/common/connection.py:511
-#: ../src/common/connection.py:1067
-#: ../src/common/zeroconf/connection_zeroconf.py:237
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Could not connect to \"%s\""
-
-#: ../src/common/connection.py:479
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Connected to server %s:%s with %s"
-
-#: ../src/common/connection.py:512
-msgid "Check your connection or try again later"
-msgstr "Check your connection or try again later"
-
-#: ../src/common/connection.py:537
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Authentication failed with \"%s\""
-
-#: ../src/common/connection.py:538
-msgid "Please check your login and password for correctness."
-msgstr "Please check your login and password for correctness."
-
-#: ../src/common/connection.py:581
-msgid "Error while removing privacy list"
-msgstr "Error while removing privacy list"
-
-#: ../src/common/connection.py:582
-#, fuzzy, python-format
-msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
-msgstr ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:682
-#: ../src/common/zeroconf/connection_zeroconf.py:163
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passphrase was not given"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:845
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[This message is *encrypted* (See :JEP:`27`]"
-
-#: ../src/common/connection.py:916
-#: ../src/common/zeroconf/connection_zeroconf.py:423
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Subject: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1099
-msgid "Not fetched because of invisible status"
-msgstr "Not fetched because of invisible status"
-
-#: ../src/common/contacts.py:294
-msgid "Not in roster"
-msgstr "Not in roster"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-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:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus capabilities of Gajim cannot be used"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-
-#: ../src/common/exceptions.py:39
-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:47
-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:55
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "one"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "two"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "three"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "four"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "five"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "six"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "seven"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "eight"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "nine"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "ten"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "eleven"
-
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "twelve"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0 o'clock"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "five past $0"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ten past $0"
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "quarter past $0"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "twenty past $0"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "twenty five past $0"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "half past $0"
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "twenty five to $1"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "twenty to $1"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "quarter to $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ten to $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "five to $1"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 o'clock"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Night"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Early morning"
+#~ msgid "_Log off"
+#~ msgstr "_Atsijungti"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Morning"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Almost noon"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Noon"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Afternoon"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Evening"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Late evening"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Start of week"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Middle of week"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "End of week"
-
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Weekend!"
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in username."
-msgstr "Invalid character in username."
-
-#: ../src/common/helpers.py:120
-msgid "Server address required."
-msgstr "Server address required."
-
-#: ../src/common/helpers.py:125
-msgid "Invalid character in hostname."
-msgstr "Invalid character in hostname."
-
-#: ../src/common/helpers.py:131
-msgid "Invalid character in resource."
-msgstr "Invalid character in resource."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:174
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:185
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:188
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:191
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:222
-msgid "_Busy"
-msgstr "_Užimtas"
-
-#: ../src/common/helpers.py:224
-msgid "Busy"
-msgstr "Užimtas"
-
-#: ../src/common/helpers.py:227
-msgid "_Not Available"
-msgstr "_Nepasiekiamas"
-
-#: ../src/common/helpers.py:232
-msgid "_Free for Chat"
-msgstr "_Laisvas Pokalbiams"
-
-#: ../src/common/helpers.py:234
-msgid "Free for Chat"
-msgstr "Laisvas Pokalbiams"
-
-#: ../src/common/helpers.py:237
-msgid "_Available"
-msgstr "_Prisijungęs"
-
-#: ../src/common/helpers.py:239
-msgid "Available"
-msgstr "Prisijungęs"
-
-#: ../src/common/helpers.py:241
-msgid "Connecting"
-msgstr "Jungiamasi"
-
-#: ../src/common/helpers.py:244
-msgid "A_way"
-msgstr "_Nuėjęs"
-
-#: ../src/common/helpers.py:249
-msgid "_Offline"
-msgstr "A_tsijungęs"
-
-#: ../src/common/helpers.py:251
-msgid "Offline"
-msgstr "Atsijungęs"
-
-#: ../src/common/helpers.py:254
-msgid "_Invisible"
-msgstr "N_ematomas"
-
-#: ../src/common/helpers.py:260
-msgid "?contact has status:Unknown"
-msgstr "Būklė nežinoma"
-
-#: ../src/common/helpers.py:262
-msgid "?contact has status:Has errors"
-msgstr "Būklė klaidinga"
-
-#: ../src/common/helpers.py:267
-msgid "?Subscription we already have:None"
-msgstr "Joks"
-
-#: ../src/common/helpers.py:269
-msgid "To"
-msgstr "Kam"
-
-#: ../src/common/helpers.py:273
-msgid "Both"
-msgstr "Abu"
-
-#: ../src/common/helpers.py:281
-msgid "?Ask (for Subscription):None"
-msgstr "Joks"
-
-#: ../src/common/helpers.py:283
-msgid "Subscribe"
-msgstr "Subscribe"
-
-#: ../src/common/helpers.py:292
-msgid "?Group Chat Contact Role:None"
-msgstr "None"
-
-#: ../src/common/helpers.py:295
-msgid "Moderators"
-msgstr "Moderators"
+#~ msgid "_Log on"
+#~ msgstr "_Prisijungti"
 
-#: ../src/common/helpers.py:297
-msgid "Moderator"
-msgstr "Moderator"
-
-#: ../src/common/helpers.py:300
-msgid "Participants"
-msgstr "Participants"
-
-#: ../src/common/helpers.py:302
-msgid "Participant"
-msgstr "Participant"
-
-#: ../src/common/helpers.py:305
-msgid "Visitors"
-msgstr "Visitors"
-
-#: ../src/common/helpers.py:307
-msgid "Visitor"
-msgstr "Visitor"
-
-#: ../src/common/helpers.py:313
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "None"
-
-#: ../src/common/helpers.py:315
-msgid "Owner"
-msgstr "Owner"
-
-#: ../src/common/helpers.py:317
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../src/common/helpers.py:319
-msgid "Member"
-msgstr "Member"
-
-#: ../src/common/helpers.py:358
-msgid "is paying attention to the conversation"
-msgstr "is paying attention to the conversation"
-
-#: ../src/common/helpers.py:360
-msgid "is doing something else"
-msgstr "is doing something else"
-
-#: ../src/common/helpers.py:362
-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:365
-msgid "paused composing a message"
-msgstr "paused composing a message"
-
-#: ../src/common/helpers.py:367
-msgid "has closed the chat window or tab"
-msgstr "has closed the chat window or tab"
-
-#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
-#, fuzzy, python-format
-msgid "%d message pending"
-msgid_plural "%d messages pending"
-msgstr[0] "Siųsti žinutę"
-msgstr[1] "Siųsti žinutę"
-
-#: ../src/common/helpers.py:926
-#, python-format
-msgid " from room %s"
-msgstr ""
+#~ msgid "Save passphrase"
+#~ msgstr "Save passphrase"
 
-#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
-#, python-format
-msgid " from user %s"
-msgstr ""
+#~ msgid "Affiliation:"
+#~ msgstr "Affiliation:"
 
-#: ../src/common/helpers.py:931
-#, python-format
-msgid " from %s"
-msgstr ""
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Connected to server %s:%s with %s"
 
-#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
-#, python-format
-msgid "%d event pending"
-msgid_plural "%d events pending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/common/helpers.py:978
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Connection to host could not be established"
 
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "error: cannot open %s for reading"
-
-#: ../src/common/optparser.py:203 ../src/common/optparser.py:204
-msgid "cyan"
-msgstr "cyan"
-
-#: ../src/common/optparser.py:320
-msgid "migrating logs database to indices"
-msgstr "migrating logs database to indices"
-
-#: ../src/common/passwords.py:82
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim account %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:135
-#: ../src/common/zeroconf/client_zeroconf.py:218
-msgid "Connection to host could not be established"
-msgstr "Connection to host could not be established"
-
-#: ../src/common/zeroconf/client_zeroconf.py:192
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"Connection to host could not be established: Incorrect answer from server."
-
-#: ../src/common/zeroconf/client_zeroconf.py:352
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Connection to host could not be established: Timeout while sending data."
-
-#: ../src/common/zeroconf/client_zeroconf.py:638
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Contact is offline. Your message could not be sent."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"To continue sending and receiving messages, you will need to reconnect."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-msgid "Avahi error"
-msgstr "Avahi error"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Link-local messaging might not work properly."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:238
-msgid "Please check if Avahi is installed."
-msgstr "Please check if Avahi is installed."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:247
-#: ../src/common/zeroconf/connection_zeroconf.py:251
-msgid "Could not start local service"
-msgstr "Could not start local service"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:248
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Unable to bind to port %d."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:252
-#: ../src/common/zeroconf/connection_zeroconf.py:347
-msgid "Please check if avahi-daemon is running."
-msgstr "Please check if avahi-daemon is running."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:346
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Could not change status of account \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:363
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:375
-msgid "[This message is encrypted]"
-msgstr "[This message is encrypted]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Connection to host could not be established: Incorrect answer from server."
 
 #~ msgid "_Discover Services..."
 #~ msgstr "_Ieškoti paslaugų..."
@@ -7421,9 +9823,6 @@ msgstr "[This message is encrypted]"
 #~ msgid "_Use proxy"
 #~ msgstr "_Naudoti proksi"
 
-#~ msgid "Accounts"
-#~ msgstr "Prieiga"
-
 #~ 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 "
@@ -7448,9 +9847,6 @@ msgstr "[This message is encrypted]"
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "Įjungti lokalūjį pokalbių r_ežimą"
 
-#~ msgid "_Modify"
-#~ msgstr "_Keisti"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kompaktiška išvaizda    Alt+C"
 
@@ -7496,9 +9892,6 @@ msgstr "[This message is encrypted]"
 #~ "Jei pažymėta, Gajim atsimins kontaktų sąrašo ir pokalbių lango pozicijas "
 #~ "ir dydžius ekrane sekančio paleidimo metu"
 
-#~ msgid "On every _message"
-#~ msgstr "_Kiekvienai žinutei"
-
 #~ msgid "Outgoing Chat state noti_fications:"
 #~ msgstr "Išeinančių pokalbių būklės pranešimai:"
 
@@ -7537,9 +9930,6 @@ msgstr "[This message is encrypted]"
 #~ msgid "_Remove from Roster"
 #~ msgstr "Ša_linti iš Kontaktų Sąrašo"
 
-#~ msgid "Add _Contact"
-#~ msgstr "Įtraukti _Asmenį"
-
 #~ msgid "_Filter:"
 #~ msgstr "_Filtras:"
 
@@ -7591,9 +9981,6 @@ msgstr "[This message is encrypted]"
 #~ msgstr[0] " %d unread private message"
 #~ msgstr[1] " %d unread private messages"
 
-#~ msgid "Error while adding service. %s"
-#~ msgstr "Error while adding service. %s"
-
 #~ msgid "gtk+"
 #~ msgstr "gtk+"
 
@@ -7609,9 +9996,6 @@ msgstr "[This message is encrypted]"
 #~ msgid "offline"
 #~ msgstr "offline"
 
-#~ msgid "I'm %s"
-#~ msgstr "I'm %s"
-
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
 
@@ -7636,9 +10020,6 @@ msgstr "[This message is encrypted]"
 #~ msgid "_Before time:"
 #~ msgstr "_Before time:"
 
-#~ msgid "_Publish"
-#~ msgstr "_Publish"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Retrieve"
 
diff --git a/po/nb.po b/po/nb.po
index d60aba1ea..a023fab5d 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: 2007-01-16 20:08+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-22 16:02+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -29,44 +29,53 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Send Enkel _Melding..."
+#: ../data/glade/roster_window.glade.h:7
+#, fuzzy
+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
-msgid "_Discover Services..."
-msgstr "_Oppdag Tjenester..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppe Samtale"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Rediger Konto"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Rediger Konto..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne Gmail Innboks"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Personlig Info"
+
 #: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
+#, fuzzy
+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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -79,53 +88,80 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, fuzzy
+msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vennligst fyll in data for din nye konto</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Pass_ord:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Behandle..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Bruk egendefinert maskinnavn/port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -133,67 +169,64 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Din JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Maskin:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Maskinnavn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Repeter Passord:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Bruk proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Konto"
 
@@ -202,228 +235,373 @@ msgid "Account Modification"
 msgstr "Konto Endring"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Administrator Liste"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Auto-reconnect when connection is lost"
 msgstr "Koble til automatisk når kontakten mistes"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
-#: ../data/glade/account_modification_window.glade.h:9
-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."
-
 #: ../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 ""
+"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."
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:457
-#: ../src/notify.py:479
-#: ../src/notify.py:491
-#: ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346
-#: ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436
-#: ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154
-#: ../src/common/contacts.py:280
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Generelle"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
-#: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din egen, så filoverføringen har større mulighet for å fungere. "
-
 #: ../data/glade/account_modification_window.glade.h:19
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et tidsavbrudd som resulterer i frakobling"
-
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet bare for deg"
+#: ../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 ""
+"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/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen ved oppstart"
+#: ../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 ""
+"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
-#: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Dersom valgt vil endringer til global status (håndtert av kombomenyen nederst i kontaktvinduet) endre status på denne kontoen. "
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
+"bare for deg"
 
 #: ../data/glade/account_modification_window.glade.h:23
-msgid "Information about you, as stored in the server"
-msgstr "Informasjon om deg, slik som den er lagret på serveren"
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
+"ved oppstart"
 
 #: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Behandle..."
+#: ../data/glade/accounts_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+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/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1617
-#: ../src/config.py:3414
+#: ../data/glade/accounts_window.glade.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:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1197
-#: ../src/config.py:1202
-#: ../src/config.py:1386
-#: ../src/config.py:1607
-#: ../src/config.py:1616
-#: ../src/config.py:1675
-#: ../src/config.py:1749
-#: ../src/config.py:3404
-#: ../src/config.py:3413
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra jabber serveren når to eller flere klienter er tilkoblet med samme konto. Klienten med den høyeste prioriteten vil få hendelsen"
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra "
+"jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
+"Klienten med den høyeste prioriteten vil få hendelsen"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Ressur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren (samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få hendelsene. (se under)"
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to "
+"eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren "
+"(samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs "
+"navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
+"hendelsene. (se under)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Vis _Frakoblede Kontakter"
+
+#: ../data/glade/account_modification_window.glade.h:44
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Bruk egendefinert maskinnavn/port"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings proxier"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Justér etter status"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel samtale klient (som iChat, Trillian eller Gaim) vil vises i kontaktlisten. Du trenger ikke være koblet til en jabber server for at det skal virke.\n"
-"Dette er bare tilgjengelig dersom python-avahi er installert og avahi-tjenesten kjører."
 
-#: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account"
-msgstr "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle kontakter som om du hadde en konto"
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Post:"
 
-#: ../data/glade/accounts_window.glade.h:5
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Slå på"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Fornavn:"
+
+#: ../data/glade/accounts_window.glade.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
+
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Etternavn:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Slå på link-lokale meldinger"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Gi _nytt navn"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Endre"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Fjern"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Bruk egendefinert port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -518,12 +696,14 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.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"
+msgstr ""
+"<b>MERK:</b> Du bør starte gajim på nytt for å aktivere noen instillinger"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -542,45 +722,45 @@ msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Lister over Utestengte"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 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:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Velg MFD (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Oppdater MFD (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Lister over Utestengte"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Send Server Melding"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Send Melding"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr "et vindu/fane åpent med den kontakten"
@@ -594,7 +774,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Betingelser</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
@@ -611,8 +791,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Borte"
 
@@ -629,7 +808,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -638,7 +817,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -679,8 +858,11 @@ msgid "When "
 msgstr "Når"
 
 #: ../data/glade/advanced_notifications_window.glade.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"
+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
 msgid "_Disable auto opening chat window"
@@ -741,41 +923,53 @@ msgid "when I'm in"
 msgstr "når jeg er i"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Romeo og Julie</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Entry:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Sist endret:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Gamle historier"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Enetale"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Du har mottatt en ny inntreden:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Kontakter"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Forvalgt Status Melding</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Forvalgt Status Melding</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Lyder</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Endre Passord"
@@ -805,10 +999,9 @@ msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Legg til Kontaktliste"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -828,39 +1021,70 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klikk for å se tidligere samtaler med denne kontakten"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontakter"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _Fil"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Endre Open_PGP Kryptering"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Endre Open_PGP Kryptering"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kompakt Utseende    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Legg til Kontaktliste"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historie"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "In_viter til"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observerere"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
@@ -873,6 +1097,24 @@ msgstr "Rom Instillinger"
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Beskrivelse</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Server Funksjonalitet"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
@@ -914,15 +1156,18 @@ 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
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil den først bli stoppet og så fjernet."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+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
 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:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -930,8 +1175,7 @@ msgstr "_Fortsett"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
@@ -979,7 +1223,7 @@ msgstr "Gajim Tema Valg"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inaktiv"
 
@@ -1020,58 +1264,72 @@ msgid "_Background:"
 msgstr "_Bakgrunn:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Endre _Kallenavn"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Endre _Tema"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klikk for å se tidligere samtaler i dette rommet"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Konfigurer _Rom"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Konfigurer _Rom"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Lag _Bokmerke til Rommet"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Lag _Bokmerke til Rommet"
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Behandle Bokmerker"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "M_odererer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Beboer Handling"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Beboer Handling"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Stemme"
 
@@ -1079,85 +1337,83 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Tittel"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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 ""
 "<big><b>Velkommen til Gajim Historiske Logg Behandler</b></big>\n"
 "\n"
 "Du kan velge logger fra venstre og/eller søke databasen under.\n"
 "\n"
 "<b>ADVARSEL:</b>\n"
-"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+"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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim Historske Logg Behandler"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Slett"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Eksport"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Historske Logg Behandler"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Lag din egen spørring"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Spørrings Bygger..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Søk"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Søk"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Godkjenn"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Nekt"
+#, fuzzy
+msgid "Search:"
+msgstr "Søk"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Invitasjon motatt"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Logg samtale historikk"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1149
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1166,14 +1422,12 @@ msgid "Join this room automatically when I connect"
 msgstr "Gå inn i dette rommet automatisk ved tilkobling"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Passord:"
 
@@ -1182,13 +1436,12 @@ msgid "Recently:"
 msgstr "Nylig:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1208,18 +1461,37 @@ msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Tittel:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Rom Instillinger"
+
+#: ../data/glade/manage_pep_services_window.glade.h:2
+#, fuzzy
+msgid "_Configure"
+msgstr "_Fortsett"
+
+#: ../data/glade/manage_pep_services_window.glade.h:3
+#, fuzzy
+msgid "gtk-delete"
+msgstr "Slett"
+
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
@@ -1229,47 +1501,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "HTTP Connect"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Navn:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Pass_ord:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Skriv:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Maskin:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klikk for å sette inn et uttrykksikon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Legger til kontakt til kontaktlisten"
 
 #: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Kryptering"
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Lag _Bokmerke til Rommet"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Handlinger"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Endre _Kallenavn"
 
-#. 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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "er fokusert på en annen samtale"
+
+#: ../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 "Klikk for å sette inn et uttrykksikon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Send"
 
@@ -1285,36 +1595,77 @@ msgstr "<b>Editering av Avanserte Instillinger</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Handlinger</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Egendefinert</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Rediger en regel</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Utseende på en linje</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Samtalestatus Fane Farger</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Valg</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Grensenitt valg</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Lyder</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Valg</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Liste over Uønskede</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Forvalgt Status Melding</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avansert"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1324,44 +1675,26 @@ msgstr ""
 "Bare komponering \n"
 "Deaktivert"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 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:18
-msgid "Also known as iChat style"
-msgstr "Også kjent som iChat stil"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr "Alltid sjekk etter om Gajim er _standard Jabber klient ved oppstart"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will use the default one set here"
-msgstr "Et eksempel: Dersom du har slått på status melding for borte, så vil Gajim ikke spør flere ganger etter melding når du endrer status til borte; den vil bruke standard meldingen du lager her"
+msgstr ""
+"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Auto _borte etter:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Auto _ikke tilgjengelig etter:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Autodetektér hver gang Gajim starter\n"
@@ -1370,314 +1703,421 @@ msgstr ""
 "Alltid bruk XFCE4 standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:29
-#: ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Samtale"
-
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Velg dette valget bare dersom noen som ikke er i kontaktlisten din spammer/irriterer deg. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle kontakter som ikke er i kontaktlisten"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid "Configure color and font of the interface"
-msgstr "Konfigurer farge og font for grensesnittet"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Standard Status Melding"
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Status melding:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Standard status _ikonsamling:"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Alltid sjekk etter om Gajim er _standard Jabber klient ved oppstart"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Konfigurer farge og font for grensesnittet"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Bestemt av sender\n"
-"Samtale melding\n"
-"Enkel melding"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Vis _ekstra e-post detaljer"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Viste Samtale status opp_lysninger:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "H_vert 5 minutt"
+msgid "Display _extra email details"
+msgstr "Vis _ekstra e-post detaljer"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Uttrykksikoner:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Hendelser"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:44
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å vise i samtale vinduer."
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:45
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å sende motparten."
+msgid "Display status _messages of contacts in roster"
+msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim will automatically show new events by popping up the relative window"
-msgstr "Gajim vil automatisk vise deg nye hendelser ved å sprette opp det relative vinduet"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
+"med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
+"vise i samtale vinduer."
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
+"med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
+"sende motparten."
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget inn"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget ut"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
+"om at en kontakt har akkurat logget ut"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim vil bare endre ikonet til kontakten som har sendt den nye hendelsen"
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Gjemmer knappene i gruppe samtale vindu."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 
 #: ../data/glade/preferences_window.glade.h:52
-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"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet og i gruppesamtaler"
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
 #: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet i kontaktliste vinduet og i gruppesamtaler"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:55
-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 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på skjermen, samt størrelsen på de til neste gang du åpner de"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
+"i kontaktliste vinduet og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte eller statiske grafiske uttrykksikoner"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorér rikt innhold i innkommende meldinger"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:59
-msgid "Ma_nage..."
-msgstr "Be_handle..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:60
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Velg dette valget bare dersom noen som ikke er i kontaktlisten din spammer/"
+"irriterer deg. Bruk med varsomhet, fordi det blokkerer alle meldinger fra "
+"alle kontakter som ikke er i kontaktlisten"
+
+#: ../data/glade/preferences_window.glade.h:62
+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 ""
-"Aldri\n"
-"Alltid\n"
-"Per konto\n"
-"Per type"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Alarmer meg om kontakter som:"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
+"vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Alarmér om nye _Gmail e-post"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "På hver _melding"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
+"eller statiske grafiske uttrykksikoner"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "En melding _vindu:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Utgående Samtale status opp_lysninger:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "En melding _vindu:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Spill av _lyder"
+msgid "Ma_nage..."
+msgstr "Be_handle..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Tilstedeværelse"
+#, fuzzy
+msgid "Notifications"
+msgstr "Konto Endring"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Utskrifts tid:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Alarmer meg om kontakter som:"
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Alarmer meg om kontakter som:"
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Sett status til å vise navnet på _musikk som spilles"
+msgid "Notify on new _GMail email"
+msgstr "Alarmér om nye _Gmail e-post"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Vis bare i _kontaktliste"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Personlig Info"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "Logger _inn"
+msgid "Play _sounds"
+msgstr "Spill av _lyder"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "Logger _ut"
-
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom valgt vil Gajim kun vise rå meldings tekst."
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Status"
-msgstr "Status"
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Preferences"
+msgstr "Tilstedeværelse"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Den automatiserte borte meldinen"
+msgid "Sign _in"
+msgstr "Logger _inn"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Den autmatiserte ikke tilgjengelig meldingen"
+msgid "Sign _out"
+msgstr "Logger _ut"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Behandle alle innkommende meldinger som:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
+"valgt vil Gajim kun vise rå meldings tekst."
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Bruk _transportenes ikoner"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Bruk systemets _standardinstillinger"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Status"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Standard status _ikonsamling:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil følgende metoder kunne bli brukt for å informere deg om det. Vennligst merk at ny melding hendelser vil bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale med."
+#, fuzzy
+msgid "Style"
+msgstr "Henger"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Når en ny hendelse blir motatt"
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/glade/preferences_window.glade.h:88
-msgid "Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr "Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du besøke http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Avanserte Innstillinger for Hendelsesmeldinger..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Nettleser:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Bruk _transportenes ikoner"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Fil behandler:"
+msgid "Use system _default"
+msgstr "Bruk systemets _standardinstillinger"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Font:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Når en ny hendelse blir motatt"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Uthev feilstavede ord"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Auto _borte etter:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
+msgid "_Browser:"
+msgstr "_Nettleser:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "_Innkommende melding:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Viste Samtale status opp_lysninger:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "_Logg status endringer til kontakter"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Uttrykksikoner:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Post klient:"
+msgid "_File manager:"
+msgstr "_Fil behandler:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Aldri"
+msgid "_Highlight misspelled words"
+msgstr "_Uthev feilstavede ord"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Gi meg beskjed om det"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Åpne..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorér rikt innhold i innkommende meldinger"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "_Utgående melding:"
+msgid "_Incoming message:"
+msgstr "_Innkommende melding:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Spiller:"
+msgid "_Log status changes of contacts"
+msgstr "_Logg status endringer til kontakter"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Sprett opp"
+msgid "_Mail client:"
+msgstr "_Post klient:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "_Tilbakestill til Standard Farger"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Auto _ikke tilgjengelig etter:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Sorter kontakter etter status"
+msgid "_Open..."
+msgstr "_Åpne..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "_Status melding:"
+msgid "_Outgoing message:"
+msgstr "_Utgående melding:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_URL:"
+msgid "_Reset to Default Colors"
+msgstr "_Tilbakestill til Standard Farger"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Viste Samtale status opp_lysninger:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "_Status melding:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Bli med i _Gruppe Samtale"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "ikke i kontaktliste"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutter"
 
@@ -1713,6 +2153,10 @@ msgstr "Alle"
 msgid "Allow"
 msgstr "Tillate"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Nekt"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1721,8 +2165,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1863
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -1762,142 +2205,177 @@ msgstr "å sende meg status"
 msgid "to view my status"
 msgstr "å se min status"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Legg til regel</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Om"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Personlig Bilde:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresse"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Fødselsdag:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Personlig Bilde:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Fødselsdag:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "By:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Lyder</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Bedrift:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Avdeling:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-Post:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Etternavn:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Egendefinert</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Fornavn:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Hjemmeside:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Legg til regel</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Egendefinert</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Kallenavn:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Mellomnavn:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefon Nummer:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Mer"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Betingelser</b>"
 
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Post Kode:"
+
+#. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Personlig Info"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Lyder</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefon Nummer:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Plassering:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Post Kode:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Instillinger</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Tittel:"
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Lyder</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:38
-#: ../src/vcard.py:273
-msgid "Role:"
-msgstr "Rolle:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Om"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Fylke:"
+msgid "Click to set your avatar"
+msgstr "Klikk for å sette ditt kontaktbilde"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Gate:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Suffix:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Personlig Info"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Jobb"
 
@@ -1913,79 +2391,128 @@ msgstr "Fjern kontoe _bare fra Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Fjern"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "F_orespør å se hans/hennes status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Legg til Spesiell _Alarm"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Tilegn Open_PGP Nøkkel"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Rediger _Grupper"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_viter til"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Send _Melding"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Fjern"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Send egendefinert XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Send _Fil"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Forby han/henne å se min status"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028
-#: ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "_Fjern fra Kontaktliste"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Omdøpe Kontakt"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Gi Nytt Navn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Abonnement"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "ni"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Kontoer"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Legg til Kontakt..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Ny _Kontakt"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Server Funksjonalitet"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -1999,52 +2526,91 @@ msgstr "Ofte Stilte Spørsmål (online)"
 msgid "Help online"
 msgstr "Hjelp online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Vis _Kontaktliste"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Innhold"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoer"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Oppdag Tjenester"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1256
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Innhold"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Vis"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Vennligst vent, henter liste over kommandoer..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Søk"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Ny _Kontakt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Kontaktinformasjon"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Søk"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "G_å"
@@ -2053,10 +2619,6 @@ msgstr "G_å"
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registrer til:"
@@ -2118,8 +2680,12 @@ 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
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er tilkoblet"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+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
 msgid "Subscription Request"
@@ -2129,10 +2695,31 @@ msgstr "Abonnerings Forespørsel"
 msgid "_Deny"
 msgstr "_Nekt"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID til kontakten du ønsker å snakke med"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
@@ -2145,58 +2732,73 @@ msgstr "Vis _Kontaktliste"
 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:5
-msgid "Ask:"
-msgstr "Spør:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Handlinger</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Klient:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Egendefinert</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Ressurs:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Instillinger</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Beskrivelse</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Egendefinert</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Konfigurer _Rom"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Ressurs:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Abonnement:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Logg samtale historikk"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Velg Bilde"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2206,11 +2808,6 @@ msgstr "<b>Jabber Trafikk</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Slå på"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2229,15 +2826,29 @@ msgstr "_Melding"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Fornavn:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Legg til Spesiell _Alarm"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Etternavn:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Tilegn Open_PGP Nøkkel"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Rediger _Grupper"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Gi Nytt Navn"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Rediger Konto..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2247,530 +2858,3262 @@ msgstr "Lokal jid:"
 msgid "Personal"
 msgstr "Personlige"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Ressurs:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Rediger Konto"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Bruk egendefinert port:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Kontaktinformasjon"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:137
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ingen)"
 
-#. we talk about password
-#: ../src/advanced.py:240
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Gjemt"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Tysk"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:208
-#: ../src/dialogs.py:1517
-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 export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør du export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile eller i den globale /etc/profile.\n"
-"\n"
-"Utheving av feilstavede ord funksjonen vil ikke bli brukt."
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:270
-#: ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:271
-#: ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:852
-msgid "Chats"
-msgstr "Samtaler"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Kryptering påslått"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "ikke i kontaktliste"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
 
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" etter %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Kryptering avslått"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Bruk autentisering"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Bruk autentisering"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Kryptering påslått"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Kommandoer: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
+"tredje person. (f.eks. /%s explodes.)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Ingen hjelpe informasjon for /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Denne meldingen er kryptert]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Kryptering avslått"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1406
-#: ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:785
-#: ../src/gajim.py:786
-#: ../src/gajim.py:1130
-#: ../src/roster_window.py:332
-#: ../src/roster_window.py:410
-#: ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508
-#: ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890
-#: ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900
-#: ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73
-#: ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "ikke i kontaktliste"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Denne meldingen er kryptert]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Denne meldingen er kryptert]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1551
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli mistet."
+#: ../src/chat_control.py:2226
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
+"mistet."
+
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
 
-#: ../src/config.py:137
-#: ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "lager logg database"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, 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:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim vill nå lukkes"
+
+#: ../src/common/check_paths.py:136
+#, 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:152
+#, python-format
+msgid "creating %s directory"
+msgstr "lager %s mappe"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Endre statusinformasjon"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Endre status"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Sett fraværstype og beskrivelse"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Ledig for samtale"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Tilkoblet"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Utvidet borte"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Ikke forstyrr"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Frakoblet - ikke kontakt"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Tilstedeværelses beskrivelse:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Statusen har blitt endret."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Gå ut av Gruppesamtale"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s fra %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Du har ikke blitt med i en gruppesamtale."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Gruppesamtaler"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Du gikk ut av følgende gruppesamtaler:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d ulest melding"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tid i minutter før status endres til borte."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Borte på grunn av inaktivitet"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tid i minutter før status endres til ikke tilgjengelig."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Ikke tilgjengelig på grunn av inaktivitet"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Standard"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Slå på link-lokal/zeroconf meldinger"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Språk som brukes av ordlisten"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - vis klokkeslett for hver melding.\n"
+"'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
+"'never' - aldri vis klokkeslett."
+
+#: ../src/common/config.py:121
+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 ""
+"Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til "
+"4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
+"den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Behandle * / _ par som mulige formaterings symboler."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
+"fjernet."
+
+#: ../src/common/config.py:128
+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 ""
+"Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ascii "
+"formatering dersom valgt. For syntax, se http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
+"installere docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
+"gruppesamtaler."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
+"opptatt av noen andre i samtalegruppen."
+
+#: ../src/common/config.py:161
+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 ""
+"Dette valget lar deg endre tidsformatet som skrives i samtaler. For eksempel "
+"\"[%H:%M] \" vil vise \"[hour:minute] \". Se python dokumentasjon på "
+"strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
+"time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Tegn som skrives før kallenavnet i samtaler"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Tegn som skrives etter kallenavnet i samtaler"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Legg * og [n] inn i kontaktliste tittelen?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
+"blir åpnet på nytt."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
+"Klient standard oppførsel)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
+"'WIKTIONARY' som betyr bruk wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status "
+"for kontoer (gitt at de ikke har listen_to_network_manager satt til False og "
+"at de synkroniserer med global status) basert på statusen til nettverks "
+"tilkoblingen."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
+"avslått."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
+"det hvert x minutt."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Spør før lukking av gruppesamtale fane/vindu."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
+"separerte listen av rom jider."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
+"separerte listen av rom jider."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
+"adresse oversetting/port videresending."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Varsle om hendelser i system-statusfelt ikonet."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Vis fane når du har bare en samtale?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Vis notatblokk faner i samtalevinduer?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Vis lukk knapp på fanen?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Samtale status opp_lysninger:"
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
+
+#: ../src/common/config.py:219
+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 ""
+"Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
+"på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
+"oppstart."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
+"meldinger. Avhengig av valgte tema kan dette ikonet være animert."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"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:229
+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 ""
+"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:230
+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 ""
+"kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim "
+"ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/"
+"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:232
+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:233
+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:235
+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:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Ikke vis kontaktbilde for transporten selv."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
+
+#: ../src/common/config.py:238
+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 ""
+"Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil "
+"vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
+"det er ventende hendelser."
+
+#: ../src/common/config.py:240
+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 liker ikke sha informasjon når man går inn i et passord beskyttet "
+"samtalerom. Sett dette valget til False for å slutte å sende sha informasjon "
+"til gruppesamtaler"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
+"'always' - Alle meldinger sendes til ett vindu.\n"
+"'never' - Alle meldinger får egne vindu.\n"
+"'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
+"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes "
+"til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
+"Gajim før det aktiveres"
+
+#: ../src/common/config.py:244
+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:245
+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:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Gjemmer knappene i gruppe samtale vindu."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Gjemmer tittel banneret i to personers samtale vindu"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
+
+#: ../src/common/config.py:250
+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 ""
+"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:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Send melding og lukk vinduet"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
+
+#: ../src/common/config.py:254
+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:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
+
+#: ../src/common/config.py:256
+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 ""
+"Dersom True vil du kunne sette en negativ prioritet til din konto i "
+"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:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
+"konto passord."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
+"og gruppe rader. "
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+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:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritet vil endre automatisk i følge med din status. Prioritetene "
+"defineres i autopriority_* valgene."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 omvei"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Dersom valgt vil Gajim bruke din IP og proxier definert i "
+"file_transfer_proxies valget for filoverføring."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "alle eller mellomroms separert status"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no', eller 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' eller ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Sover"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Snart tilbake"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Tilbake om noen minutter."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Spiser"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Jeg spiser, så legg igjen en beskjed"
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Jeg ser på en film."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Jobber"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Jeg jobber."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Jeg sitter i telefonen."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Ute"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Jeg er ute og lever livet."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Jeg er tilgjengelig."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Ledig for prat."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Snart tilbake."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Jeg er ikke tilgjengelig."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Ikke forstyrr."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Hade bra!"
+
+#: ../src/common/config.py:441
+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 ""
+"Lyd som spilles når en samtalerom melding inneholder et av ordene i "
+"muc_highlight_words, eller når en samtalerom melding inneholder ditt "
+"kallenavn."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Lyd som spilles når en ny samtalerom melding mottas."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "grønn"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "varehandel"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "menneskelig"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marine"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Klarer ikke å uvirksom modulen"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Feil maskinnavn"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, 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:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Utvidelse ikke støttet"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Kallenavn ikke lovlig: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du er uønsket i dette samtalerommet."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Et slikt samtalerom finnes ikke."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Gruppesamtale oppretting er begrenset."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Ditt registrerte kallenavn må bli brukt. "
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du er ikke medlems listen."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Godkjenning har blitt fjernet"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+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:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi abonnerer nå på %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "frakoblings ønske fra %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "vi abonnerer ikke lenger på %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
+"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
+"fjerne den"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passordsetning ble ikke gitt"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Klarer ikke å uvirksom modulen"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Tilkobling til konto \"%s\" har blitt mistet"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Automatisk tilkobling."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Ukjent D-Bus versjon: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Ugyldig svar"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Tilkobling Feilet"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunne ikke koble til \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Kunne ikke koble til \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Tilkobling til konto \"%s\" har blitt mistet"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Ukjent D-Bus versjon: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autentisering feilet med \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Feil ved fjerning av liste over uønskede"
+
+#: ../src/common/connection.py:801
+#, fuzzy, 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 ""
+"Listen over utestengte %s har ikke blitt fjernet. Den er kanskje aktiv i en "
+"av dine tilkoblede ressurser. Deaktiver den og prøv igjen."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tittel: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Ikke hentet på grunn av usynlig status"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observerere"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transporter"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "ikke i kontaktliste"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindinger mangler på denne maskinen"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Konto navn kan ikke være tomt."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sesjons bussen er ikke tilgjengelig.\n"
+"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "en"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "to"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tre"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "fire"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "fem"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "seks"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "syv"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "åtte"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "ni"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "ti"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "elleve"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "tolv"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "klokken $0"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "fem over $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "ti over $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "kvart over $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "ti på halv $1"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "fem på halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "fem over halv $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "ti over halv $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "kvart på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "ti på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "fem på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Natt"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Tidlig morgen"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Morgen"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Nesten formiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Middag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Ettermiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Ettermiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Sen kveld"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Starten av uken"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Midten av uken"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Slutten av uken"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Helg!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Ugyldig karakter i brukernavn."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Server adresse kreves."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Ugyldig karakter i domene navn."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Ugyldig karakter i ressurs."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Opptatt"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Opptatt"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Ikke Tilgjengelig"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Ledig for Samtale"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Ledig for Prat"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Tilgjengelig"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Tilgjengelig"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Kobler til"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "B_orte"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Frakoblet"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Usynlig"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Ukjent"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Har feilmeldinger"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Ingen"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Til"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Begge"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Ingen"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Abonnér"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Ordstyrere"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Ordstyrer"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Deltakere"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Deltaker"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Besøkende"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Besøk"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Ingen"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Eier"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Medlem"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "er fokusert på en annen samtale"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "gjør noe annet"
+
+#: ../src/common/helpers.py:405
+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:408
+msgid "paused composing a message"
+msgstr "tok pause i skriving av en melding"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "har lukket samtalevinduet eller fanen"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Send melding"
+msgstr[1] "Send melding"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "Fra %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "Fra %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "Fra %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "feil: kan ikke åpne %s for lesing"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "turkis"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "migrerer logg databaser til indekser"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim konto %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pauset"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Fet"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Har"
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Samtaler"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Fet"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Innhold"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Komplett"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Innhold"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deaktivert"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "uri"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Slett"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
 msgstr "Deaktivert"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Deaktivert"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Deaktivert"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Aktivert"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Gruppe"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Maskin:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "melding"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Aktivert"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Usynlig"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "en"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Maskin:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Tysk"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Endre"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Frakoblet"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Gruppe"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "elleve"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Henger"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Sist endret:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Kallenavn"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Sover"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Gate:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Abonnerte"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tid"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Strek Under"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Feil maskinnavn"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Ettermiddag"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Morgen"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "alle i gruppen"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Ettermiddag"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Utkasting %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Bli med"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "rom"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Endrer Tittel"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Utkasting %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "enkel"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Utkasting %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "Logger _ut"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Grunn"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Grunn"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Sover"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Jeg ser på en film."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Jeg sitter i telefonen."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Overfører"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Tilkoblet"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Åpne som _Link"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Jobber"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Hvert %s _minutt"
+msgid "Unable to bind to port %s."
+msgstr "Klarer ikke å lytte til port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli "
+"avbrutt."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
+"data."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke "
+"gyldig, så den ignoreres."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/config.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahi feil"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-lokal meldinger fungerer muligens ikke riktig."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Vennligst sjekk om Avahi er installert."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Kunne ikke starte lokal tjeneste"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Klarer ikke å lytte til port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunne ikke endre status til konto \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
+"sendes."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Denne meldingen er kryptert]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Feil ved tilføying av tjeneste. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:684
-#: ../src/gajim.py:2165
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Standard Status Melding"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Slå på"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Egendefinert</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:685
-#: ../src/gajim.py:2166
+#: ../src/config.py:651
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet språk ved å sette stavekontro_llspråk valget."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:1046
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Neste Melding Motatt"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/config.py:1261
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Navn"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Logge inn på nytt nå?"
+
+#: ../src/config.py:1406
+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:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Uleste hendelser"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har åpne samtaler på konto %s"
+
+#: ../src/config.py:1694
+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:1705
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1311
-#: ../src/config.py:1905
-msgid "Unread events"
-msgstr "Uleste hendelser"
-
-#: ../src/config.py:1312
+#: ../src/config.py:1710
 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:1316
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1317
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg et annet navn."
+#: ../src/config.py:1717
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
+"et annet navn."
 
-#: ../src/config.py:1321
-#: ../src/config.py:1325
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1322
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1326
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1334
-#: ../src/config.py:1340
-#: ../src/config.py:1350
-#: ../src/config.py:3013
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Behandle Kontoer"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Skriv inn nytt navn for gruppe %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1341
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1400
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1401
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1529
-#: ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Snart tilbake."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1539
-msgid "Relogin now?"
-msgstr "Logge inn på nytt nå?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:1540
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Velg din OpenPGP nøkkel"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1567
+#: ../src/config.py:2089
 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:1574
-#: ../src/dialogs.py:1131
-#: ../src/dialogs.py:1317
-#: ../src/disco.py:417
-#: ../src/profile_window.py:313
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1575
+#: ../src/config.py:2097
 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:1579
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:1580
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:1604
-#: ../src/config.py:3401
-msgid "Failed to get secret keys"
-msgstr "Klarte ikke å hente hemmelig nøkkel"
-
-#: ../src/config.py:1605
-#: ../src/config.py:3402
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
-
-#: ../src/config.py:1608
-#: ../src/config.py:3405
-msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Nøkkel Valg"
-
-#: ../src/config.py:1609
-#: ../src/config.py:3406
-msgid "Choose your OpenPGP key"
-msgstr "Velg din OpenPGP nøkkel"
-
-#. Name column
-#: ../src/config.py:1839
-#: ../src/disco.py:741
-#: ../src/disco.py:1467
-#: ../src/disco.py:1705
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Navn"
-
-#: ../src/config.py:1842
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1906
-msgid "Read all pending events before removing this account."
-msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
-
-#: ../src/config.py:1943
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Du har åpne samtaler på konto %s"
-
-#: ../src/config.py:1944
-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:2003
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2004
+#: ../src/config.py:2134
 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:2238
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2240
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2312
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2348
-#: ../src/disco.py:748
-#: ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2365
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2388
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2778,11 +6121,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2390
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2391
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2790,11 +6133,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2393
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2394
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2802,11 +6145,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2397
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2814,7 +6157,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2830,369 +6173,485 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2503
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2520
-#: ../src/roster_window.py:2733
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2521
-#: ../src/roster_window.py:2729
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2522
-#: ../src/roster_window.py:2734
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2536
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2537
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2624
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2692
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2725
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2726
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2792
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:2988
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2989
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2999
-#: ../src/dialogs.py:1336
-msgid "Invalid password"
-msgstr "Ugyldig passord"
-
-#: ../src/config.py:3000
-msgid "You must enter a password for the new account."
-msgstr "Du må skrive inn et passord for den nye kontoen"
-
-#: ../src/config.py:3004
-#: ../src/dialogs.py:1341
-msgid "Passwords do not match"
-msgstr "Passordene er ikke like"
-
-#: ../src/config.py:3005
-#: ../src/dialogs.py:1342
-msgid "The passwords typed in both fields must be identical."
-msgstr "Passordene du skriver inn i begge felt må være identiske."
-
-#: ../src/config.py:3024
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:3025
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:3042
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3043
-#: ../src/config.py:3078
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra hovedvinduet."
+#: ../src/config.py:3119 ../src/config.py:3308
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
+"eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
+"hovedvinduet."
 
-#: ../src/config.py:3077
-msgid "Your new account has been created successfully"
-msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kontakt allerede i kontaktlisten"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3153
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:271
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med i denne gruppe samtalen"
+#: ../src/conversation_textview.py:549
+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:340
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+msgstr ""
+"Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
+"i denne gruppe samtalen"
+
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:712
 #, 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:386
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:790
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM klient"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Velg MFD (MOTD)"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Status Melding"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
+"et annet navn."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
+msgstr ""
+"Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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."
+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:779
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:909
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Klarer ikke å lytte til port %s."
-
-#: ../src/dialogs.py:910
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli avbrutt."
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
+msgid ""
+"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 ""
+"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/dialogs.py:1061
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:1064
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1124
-#: ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1132
+#: ../src/dialogs.py:1686
 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:1147
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1215
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:1216
-#: ../src/dialogs.py:1222
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:1229
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:1268
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Kontoen \"%s\" er tilkoblet til serveren"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1271
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3201,522 +6660,845 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1296
-#: ../src/dialogs.py:1655
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1297
-#: ../src/dialogs.py:1656
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1306
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:1318
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:1337
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Ugyldig passord"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Passordene er ikke like"
+
+#: ../src/dialogs.py:2025
+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:1384
-#: ../src/notify.py:211
-#: ../src/notify.py:415
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:1386
-#: ../src/notify.py:219
-#: ../src/notify.py:417
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:238
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:223
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1389
-#: ../src/notify.py:230
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:1389
-#: ../src/gajim.py:1225
-#: ../src/notify.py:428
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1391
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1393
-#: ../src/gajim.py:1197
-#: ../src/gajim.py:1354
-#: ../src/notify.py:424
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1395
-#: ../src/gajim.py:1417
-#: ../src/gajim.py:1439
-#: ../src/gajim.py:1456
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1396
-#: ../src/gajim.py:1420
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1398
-#: ../src/gajim.py:1094
-#: ../src/notify.py:430
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1400
-#: ../src/notify.py:203
-#: ../src/notify.py:432
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:1587
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1592
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1615
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, fuzzy, python-format
+msgid "Form %s"
+msgstr "Fra %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1688
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1732
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1857
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:1909
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Rekkefølge: %s, handling: %s, type: %s, verdi: %s"
 
-#: ../src/dialogs.py:1912
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %s, handling: %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:2041
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:2139
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:2210
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Du har ikke blitt med i en gruppesamtale."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "%Contact har invitert deg til gruppesamtalen %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2328
-#: ../src/dialogs.py:2373
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:2363
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:2508
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2514
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:2635
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Andre"
 
-#: ../src/disco.py:102
-#: ../src/disco.py:103
-#: ../src/disco.py:1253
-#: ../src/gajim.py:539
-#: ../src/roster_window.py:271
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:368
-#: ../src/roster_window.py:451
-#: ../src/roster_window.py:483
-#: ../src/roster_window.py:485
-#: ../src/roster_window.py:3896
-#: ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transporter"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:643
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk adressen og prøv igjen."
+#: ../src/disco.py:657
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
+"adressen og prøv igjen."
 
-#: ../src/disco.py:647
-#: ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %s med %s kontoen"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1143
-#: ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Kjør Kommando"
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ingen"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Historikk Behandler"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Melding Sendt"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP Kryptering"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Innkommende melding:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Generelle"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Server Funksjonalitet"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173
-#: ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivelse: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:705
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:707
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "En fil med dette navnet eksisterer og du har ikke rettigheter til å overskrive den."
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"En fil med dette navnet eksisterer og du har ikke rettigheter til å "
+"overskrive den."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:721
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:722
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3724,90 +7506,105 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:568
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:570
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, 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"
+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:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:199
+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:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den på %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den "
+"på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3815,429 +7612,709 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autentisering for %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Passordsetning Kreves"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Feil Passordsetning"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+"samtalebruker.\n"
+"Vennligst skriv et annet kallenavn under:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:393
-#: ../src/notify.py:434
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Godtar du denne forespørselen?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autentisering for %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:710
-#, python-format
-msgid "Subject: %s"
-msgstr "Tittel: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:755
-#: ../src/gajim.py:768
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %s ( %s )"
 
-#: ../src/gajim.py:801
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:802
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:810
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:811
-msgid "You will always see him or her as offline."
-msgstr "Du vil alltid se han eller henne som frakoblet."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:854
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:855
-#: ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s er nå kjent som %s"
 
-#: ../src/gajim.py:1004
-#: ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s er nå %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1007
-#: ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s er nå %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1104
-msgid "Your passphrase is incorrect"
-msgstr "Passord setningen din er ikke riktig"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Et passord kreves for å bli med i dette samtalerommet."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
 
-#: ../src/gajim.py:1105
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1219
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Fra: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1444
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1457
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "På hver _melding"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:1575
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Brukernavn Konflikt"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Tilkobling"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Kryptering avslått"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gajim.py:2113
-msgid "Network Manager support not available"
-msgstr "Network Manager støtte er ikke tilgjengelig"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bokmerke allerede satt"
+
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/gajim.py:2188
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på en egen linje"
-
-#: ../src/gajim-remote.py:85
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:188
-#: ../src/gajim-remote.py:197
-#: ../src/gajim-remote.py:204
-#: ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:222
-#: ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:247
+#: ../src/gajim-remote.py:95
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
+"en egen linje"
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, usynlig"
+msgstr ""
+"en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+"usynlig"
 
-#: ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:100
-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 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status til alle kontoer som har \"synkroniser med global status\" valget påslått"
+#: ../src/gajim-remote.py:113
+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 ""
+"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
+"til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:115
-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 "Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+#: ../src/gajim-remote.py:128
+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 ""
+"Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
+msgstr ""
+"dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:128
-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 "Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+#: ../src/gajim-remote.py:141
+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 ""
+"Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID til kontakten som vil motta meldingen"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Returnerer innstillinger (globale innstillinger om ikke en konto er spesifisert)"
+msgstr ""
+"Returnerer innstillinger (globale innstillinger om ikke en konto er "
+"spesifisert)"
 
-#: ../src/gajim-remote.py:209
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Returnerer gjeldende status melding (den globale om ikke en konto er spesifisert)"
+#: ../src/gajim-remote.py:231
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Returnerer gjeldende status melding (den globale om ikke en konto er "
+"spesifisert)"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:229
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt til alle kontoer"
+#: ../src/gajim-remote.py:251
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Rom:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Kallenavn ikke funnet: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "passord"
 
 #: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Passordene er ikke like"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Vis eller skjul kontaktliste vinduet"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4246,29 +8323,31 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Bruk: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:358
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:362
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4277,948 +8356,1186 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:439
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:443
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argumentet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:461
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Feil uri"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Du kan ikke slette ditt gjeldene tema"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privat Samtale"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Private Samtaler"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Du er ikke lenger i samtalerommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppe Samtale"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppe Samtaler"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Samtale Historikk"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Tilkobling"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:1142
 #, 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:840
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1153
 #, 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:852
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Tilhørighet: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s er nå kjent som %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s har blitt utvist: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1063
-#: ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174
-#: ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117
-#: ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s ser ikke ut til å være en gyldig JID"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før teksten)"
-
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1656
 #, python-format
-msgid "Commands: %s"
-msgstr "Kommandoer: %s"
-
-#: ../src/groupchat_control.py:1253
-#, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
-
-#: ../src/groupchat_control.py:1260
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den spesifiserte brukeren."
-
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
-
-#: ../src/groupchat_control.py:1266
-#, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak dersom spesifisert."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
+"samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det "
+"inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil "
+"denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1269
+#: ../src/groupchat_control.py:1663
 #, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Bruk: /%s, gjemmer samtale knappene."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
+"spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1669
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser en grunn dersom spesifisert."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
+"dersom spesifisert."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1675
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og gir mulighet for å spesifisere valgfritt kallenavn."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
+"en grunn dersom spesifisert."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1679
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke mellomrom i kallenavn."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
+"gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1683
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk tredje person. (f.eks. /%s explodes.)"
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
+"kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
+"mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1692
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender meldingen til brukeren spesifisert av kallenavn."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
+"sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende samtalerom."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+"samtalerom."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
-
-#: ../src/groupchat_control.py:1305
-#, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre kommandoer."
+msgstr ""
+"Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
 
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1708
 #, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjelpe informasjon for /%s"
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
+"kommandoer."
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1837
 #, 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:1361
-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:1365
-#: ../src/roster_window.py:4036
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
+#: ../src/groupchat_control.py:1839
+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:1399
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1435
-msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
-
-#: ../src/groupchat_control.py:1436
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Beskrivelse: %s"
 
-#: ../src/groupchat_control.py:1445
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1446
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1575
-#: ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "En programmerings feil har blitt detektert"
 
-#: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene likevel."
+#: ../src/gtkexcepthook.py:47
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene "
+"likevel."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Rapporter Feil"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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:649
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:650
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:651
+#: ../src/gtkgui_helpers.py:735
 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:750
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:751
+#: ../src/gtkgui_helpers.py:805
 #, 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:760
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/history_manager.py:186
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+#: ../src/history_manager.py:224
+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:188
+#: ../src/history_manager.py:226
 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 ""
-"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du JA, ellers klikker du NEI.\n"
+"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket "
+"som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du "
+"JA, ellers klikker du NEI.\n"
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s er nå %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Kunne ikke laste bilde"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "Bilde er for stort"
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Samtaler"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Gruppe Samtaler"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Private Samtaler"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Ny Melding fra %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Generelle"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:107
-#: ../src/profile_window.py:210
-#: ../src/profile_window.py:219
-msgid "Click to set your avatar"
-msgstr "Klikk for å sette ditt kontaktbilde"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Fil sti"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Et slikt samtalerom finnes ikke."
 
 #. keep identation
-#: ../src/profile_window.py:137
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:314
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:349
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Det skjedde en feil med publisering av din personlige informasjon, prøv igjen senere."
+#: ../src/profile_window.py:358
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det skjedde en feil med publisering av din personlige informasjon, prøv "
+"igjen senere."
 
-#: ../src/roster_window.py:171
-#: ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:344
-#: ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Observerere"
-
-#: ../src/roster_window.py:692
-#: ../src/roster_window.py:3201
-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"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Godkjenning har blitt sendt"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "bruker kontoen %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Nå vil \"%s\" kunne se din status."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "til %s kontoen"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Abonnerings forespørsel er sendt"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "på %s kontoen"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Godkjenning har blitt fjernet"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "for konto %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Behandle Bokmerker..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomekeyring er installert men ikke startet riktig (systemvariabel er ikke "
+"satt riktig)"
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "for kontoen %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Historikk Behandler"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1068
-msgid "_Join New Group Chat"
-msgstr "_Bli med i Gruppesamtale"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1398
-#: ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
+"historikk påslått."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1403
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker denne transporten."
+#: ../src/roster_window.py:2526
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
+"denne transporten."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:1411
-#, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports:%s"
-msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse transportene:%s"
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
+"transportene:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, 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:1517
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Fjern og alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1782
-#: ../src/roster_window.py:2043
-msgid "_New group chat"
-msgstr "_Ny gruppe samtale"
+#: ../src/roster_window.py:3128
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1913
-msgid "I would like to add you to my roster"
-msgstr "Jeg ønsker å legge deg til min kontaktliste"
+#: ../src/roster_window.py:3132
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
+"eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:2088
-#: ../src/roster_window.py:2135
-msgid "Send Group M_essage"
-msgstr "Send Gruppe M_elding"
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/roster_window.py:2114
-msgid "Re_name"
-msgstr "Gi _nytt navn"
+#: ../src/roster_window.py:3141
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+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:2141
-msgid "To all users"
-msgstr "Til alle brukere"
+#: ../src/roster_window.py:3144
+msgid "I want this contact to know my status after removal"
+msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: ../src/roster_window.py:2144
-msgid "To all online users"
-msgstr "Til alle påloggede brukere"
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3148
+msgid "Contacts will be removed from your roster"
+msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:2180
-msgid "_Log on"
-msgstr "_Logg på"
+#: ../src/roster_window.py:3152
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Ved å fjerne disse kontaktene:%s\n"
+"fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
+"frakoblet."
 
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "Logg _av"
+#: ../src/roster_window.py:3191
+msgid "No account available"
+msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:2312
-#: ../src/roster_window.py:2383
-msgid "_Change Status Message"
-msgstr "_Endre Status Melding"
+#: ../src/roster_window.py:3192
+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:2455
-msgid "Authorization has been sent"
-msgstr "Godkjenning har blitt sendt"
+#: ../src/roster_window.py:3708
+msgid "Metacontacts storage not supported by your server"
+msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:3710
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Din server støtter ikke lagring av metakontakt informasjon. Så denne "
+"informasjonen vil ikke bli lagret på neste oppkobling."
+
+#: ../src/roster_window.py:3784
+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:3786
+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 ""
+"Metakontakter er en måte å omgruppere flere kontakter på en linje. Generelt "
+"brukes dette når samme person har flere Jabber kontoer eller transport "
+"kontoer."
+
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Ugyldig Fil"
+
+#: ../src/roster_window.py:3910
+#, 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 ønsker å sende deg en fil:"
+msgstr[1] "%s ønsker å sende deg en fil:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Nå vil \"%s\" kunne se din status."
+msgid "using account %s"
+msgstr "bruker kontoen %s"
 
-#: ../src/roster_window.py:2476
-msgid "Subscription request has been sent"
-msgstr "Abonnerings forespørsel er sendt"
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:2477
+#. disco
+#: ../src/roster_window.py:4679
 #, 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."
+msgid "using %s account"
+msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:2489
-msgid "Authorization has been removed"
-msgstr "Godkjenning har blitt fjernet"
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Behandle Bokmerker..."
 
-#: ../src/roster_window.py:2490
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
+msgid "of account %s"
+msgstr "for konto %s"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
+msgid "for account %s"
+msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:2684
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han eller henne alltid vil se deg som frakoblet."
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:2689
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-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:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publisér"
 
-#: ../src/roster_window.py:2692
-msgid "I want this contact to know my status after removal"
-msgstr "Denne kontakten skal kunne se min status etter fjerning"
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
 
-#. several contact to remove at the same time
-#: ../src/roster_window.py:2696
-msgid "Contacts will be removed from your roster"
-msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Aktiv"
 
-#: ../src/roster_window.py:2700
-#, python-format
-msgid ""
-"By removing these contacts:%s\n"
-"you also remove authorization resulting in them always seeing you as offline."
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Oppdag Tjenester..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
 msgstr ""
-"Ved å fjerne disse kontaktene:%s\n"
-"fjerner du også autorisasjonen som gjør at de alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:2732
-msgid "Gnomekeyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Gnomekeyring er installert men ikke startet riktig (systemvariabel er ikke satt riktig)"
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Send Gruppe M_elding"
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2760
-#: ../src/common/connection.py:596
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:2777
-msgid "Passphrase Required"
-msgstr "Passordsetning Kreves"
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Til alle påloggede brukere"
 
-#: ../src/roster_window.py:2778
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:2783
-msgid "Save passphrase"
-msgstr "Lagre passordsetning"
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2791
-msgid "Wrong Passphrase"
-msgstr "Feil Passordsetning"
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Send Melding"
 
-#: ../src/roster_window.py:2792
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transporter"
 
-#: ../src/roster_window.py:2849
-#: ../src/roster_window.py:2909
-msgid "You are participating in one or more group chats"
-msgstr "Du er med i en eller flere gruppesamtaler"
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Vis Trans_porter"
 
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2910
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-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:5788
+msgid "_Maximize"
+msgstr ""
 
-#: ../src/roster_window.py:2867
-msgid "No account available"
-msgstr "Ingen konto tilgjengelig"
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakt Frakoblet"
 
-#: ../src/roster_window.py:2868
-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:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Ny Gruppesamtale"
 
-#: ../src/roster_window.py:2966
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" etter %(artist)s"
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:3395
-#: ../src/roster_window.py:3402
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Meldinger vil kun være tilgjengelig for lesing senere dersom du har historikk påslått."
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:3986
-msgid "Metacontacts storage not supported by your server"
-msgstr "Metakontakter lagring støttes ikke av din server"
+#: ../src/roster_window.py:6207
+msgid "Change Status Message..."
+msgstr "Endre Status Melding..."
 
-#: ../src/roster_window.py:3988
-msgid "Your server does not support storing metacontacts information. So those information will not be save on next reconnection."
-msgstr "Din server støtter ikke lagring av metakontakt informasjon. Så denne informasjonen vil ikke bli lagret på neste oppkobling."
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
 
-#: ../src/roster_window.py:4030
-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/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
 
-#: ../src/roster_window.py:4032
-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 "Metakontakter er en måte å omgruppere flere kontakter på en linje. Generelt brukes dette når samme person har flere Jabber kontoer eller transport kontoer."
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
 
-#: ../src/roster_window.py:4199
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Slipp %s i samtalerom %s"
+msgid "Subject: %s"
+msgstr "Tittel: %s"
 
-#: ../src/roster_window.py:4206
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Gjør %s og %s metakontakter"
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
 
-#: ../src/roster_window.py:4393
-msgid "Change Status Message..."
-msgstr "Endre Status Melding..."
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
 
-#: ../src/systray.py:144
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Tilkobling"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontakt Frakoblet"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Rom:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Aktivert"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Skriv:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5226,1458 +9543,686 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Tilhørighet: "
-
-#: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er ikke interessert i hans/hennes status."
-
-#: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/hun er ikke interessert i din."
-
-#: ../src/vcard.py:289
-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:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller han/hun i din."
-
-#: ../src/vcard.py:299
-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:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " ressurs med prioritet"
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "lager logg database"
-
-#: ../src/common/check_paths.py:89
-#: ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, 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:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim vill nå lukkes"
-
-#: ../src/common/check_paths.py:115
-#, 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:131
-#, python-format
-msgid "creating %s directory"
-msgstr "lager %s mappe"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Endre statusinformasjon"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Endre status"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Sett fraværstype og beskrivelse"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Ledig for samtale"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Tilkoblet"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Utvidet borte"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Ikke forstyrr"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Frakoblet - ikke kontakt"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Tilstedeværelses beskrivelse:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Statusen har blitt endret."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s fra %(room_jid)s"
-
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Du har ikke blitt med i en gruppesamtale."
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Gå ut av Gruppesamtale"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
-
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Gruppesamtaler"
-
-#: ../src/common/commands.py:230
-msgid "You leaved the following groupchats:"
-msgstr "Du gikk ut av følgende gruppesamtaler:"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tid i minutter før status endres til borte."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Borte på grunn av inaktivitet"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tid i minutter før status endres til ikke tilgjengelig."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Ikke tilgjengelig på grunn av inaktivitet"
-
-#: ../src/common/config.py:83
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Slå på link-lokal/zeroconf meldinger"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Språk som brukes av ordlisten"
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Applikasjoner</b>"
 
-#: ../src/common/config.py:92
+#: ../src/vcard.py:319
 msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr ""
-"'always' - vis klokkeslett for hver melding.\n"
-"'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
-"'never' - aldri vis klokkeslett."
-
-#: ../src/common/config.py:93
-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 "Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til 4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Behandle * / _ par som mulige formaterings symboler."
-
-#: ../src/common/config.py:97
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli fjernet."
-
-#: ../src/common/config.py:100
-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 "Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ascii formatering dersom valgt. For syntax, se http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du installere docutils)"
-
-#: ../src/common/config.py:109
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i gruppesamtaler."
-
-#: ../src/common/config.py:110
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er opptatt av noen andre i samtalegruppen."
-
-#: ../src/common/config.py:133
-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 "Dette valget lar deg endre tidsformatet som skrives i samtaler. For eksempel \"[%H:%M] \" vil vise \"[hour:minute] \". Se python dokumentasjon på strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Tegn som skrives før kallenavnet i samtaler"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Tegn som skrives etter kallenavnet i samtaler"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Legg * og [n] inn i kontaktliste tittelen?"
-
-#: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane blir åpnet på nytt."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
-
-#: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ Klient standard oppførsel)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller 'WIKTIONARY' som betyr bruk wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
-
-#: ../src/common/config.py:154
-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 "Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status for kontoer (gitt at de ikke har listen_to_network_manager satt til False og at de synkroniserer med global status) basert på statusen til nettverks tilkoblingen."
-
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
-
-#: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, avslått."
-
-#: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis det hvert x minutt."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Spør før lukking av gruppesamtale fane/vindu."
-
-#: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom separerte listen av rom jider."
-
-#: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms separerte listen av rom jider."
+"Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
+"ikke interessert i hans/hennes status."
 
-#: ../src/common/config.py:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med adresse oversetting/port videresending."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Varsle om hendelser i system-statusfelt ikonet."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Vis fane når du har bare en samtale?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Vis notatblokk faner i samtalevinduer?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Vis lukk knapp på fanen?"
-
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
-
-#: ../src/common/config.py:190
-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 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver oppstart."
-
-#: ../src/common/config.py:192
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste meldinger. Avhengig av valgte tema kan dette ikonet være animert."
-
-#: ../src/common/config.py:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-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:195
-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 "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:196
-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 "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:197
-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 "kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/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:199
-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:200
-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:202
-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:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Ikke vis kontaktbilde for transporten selv."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
-
-#: ../src/common/config.py:205
-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 "Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når det er ventende hendelser."
-
-#: ../src/common/config.py:207
-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 liker ikke sha informasjon når man går inn i et passord beskyttet samtalerom. Sett dette valget til False for å slutte å sende sha informasjon til gruppesamtaler"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/vcard.py:321
 msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before the changes will take effect."
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr ""
-"Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
-"'always' - Alle meldinger sendes til ett vindu.\n"
-"'never' - Alle meldinger får egne vindu.\n"
-"'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
-"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes til forskjellige vinduer. Merk, endring av dette valget krever omstart av Gajim før det aktiveres"
-
-#: ../src/common/config.py:211
-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:212
-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:213
-msgid "Hides the buttons in group chat window."
-msgstr "Gjemmer knappene i gruppe samtale vindu."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Gjemmer knappene i to personers samtale vindu."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Gjemmer tittel banneret i to personers samtale vindu"
-
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
-
-#: ../src/common/config.py:218
-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 "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:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
-
-#: ../src/common/config.py:221
-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:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt innhold mener at vi aldri viser dialogen."
-
-#: ../src/common/config.py:223
-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 "Dersom True vil du kunne sette en negativ prioritet til din konto i 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:224
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre konto passord."
-
-#: ../src/common/config.py:225
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter og gruppe rader. "
-
-#: ../src/common/config.py:226
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-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:237
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Prioritet vil endre automatisk i følge med din status. Prioritetene defineres i autopriority_* valgene."
-
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 omvei"
-
-#: ../src/common/config.py:270
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Dersom valgt vil Gajim bruke din IP og proxier definert i file_transfer_proxies valget for filoverføring."
-
-#: ../src/common/config.py:329
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
-
-#: ../src/common/config.py:330
-#: ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
-
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr "alle eller mellomroms separert status"
-
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', eller 'both'"
-
-#: ../src/common/config.py:341
-#: ../src/common/config.py:343
-#: ../src/common/config.py:344
-#: ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' eller ''"
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Sover"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Snart tilbake"
-
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Tilbake om noen minutter."
-
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Spiser"
-
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Jeg spiser, så legg igjen en beskjed"
-
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Film"
-
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Jeg ser på en film."
-
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Jobber"
-
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Jeg jobber."
-
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Jeg sitter i telefonen."
-
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Ute"
-
-#: ../src/common/config.py:360
-msgid "I'm out enjoying life."
-msgstr "Jeg er ute og lever livet."
-
-#: ../src/common/config.py:364
-msgid "I'm available."
-msgstr "Jeg er tilgjengelig."
-
-#: ../src/common/config.py:365
-msgid "I'm free for chat."
-msgstr "Ledig for prat."
-
-#: ../src/common/config.py:367
-msgid "I'm not available."
-msgstr "Jeg er ikke tilgjengelig."
-
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Ikke forstyrr."
-
-#: ../src/common/config.py:369
-#: ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Hade bra!"
-
-#: ../src/common/config.py:379
-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 "Lyd som spilles når en samtalerom melding inneholder et av ordene i muc_highlight_words, eller når en samtalerom melding inneholder ditt kallenavn."
-
-#: ../src/common/config.py:380
-msgid "Sound to play when any MUC message arrives."
-msgstr "Lyd som spilles når en ny samtalerom melding mottas."
-
-#: ../src/common/config.py:389
-#: ../src/common/optparser.py:193
-msgid "green"
-msgstr "grønn"
-
-#: ../src/common/config.py:393
-#: ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "varehandel"
-
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "menneskelig"
-
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "marine"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Klarer ikke å uvirksom modulen"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Feil maskinnavn"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "The host you configured as the ft_override_host_to_send advanced option is not valid, so ignored."
-msgstr "Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke gyldig, så den ignoreres."
-
-#: ../src/common/connection_handlers.py:590
-#, 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:1540
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kallenavn ikke lovlig: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1602
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1625
-msgid "Unable to join group chat"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+"Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
+"hun er ikke interessert i din."
 
-#: ../src/common/connection_handlers.py:1603
-msgid "A password is required to join this group chat."
-msgstr "Et passord kreves for å bli med i dette samtalerommet."
-
-#: ../src/common/connection_handlers.py:1606
-msgid "You are banned from this group chat."
-msgstr "Du er uønsket i dette samtalerommet."
-
-#: ../src/common/connection_handlers.py:1609
-msgid "Such group chat does not exist."
-msgstr "Et slikt samtalerom finnes ikke."
-
-#: ../src/common/connection_handlers.py:1612
-msgid "Group chat creation is restricted."
-msgstr "Gruppesamtale oppretting er begrenset."
-
-#: ../src/common/connection_handlers.py:1615
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerte kallenavn må bli brukt. "
-
-#: ../src/common/connection_handlers.py:1618
-msgid "You are not in the members list."
-msgstr "Du er ikke medlems listen."
-
-#: ../src/common/connection_handlers.py:1626
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/vcard.py:323
+msgid "You and the contact are interested in each other's presence information"
 msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
-
-#: ../src/common/connection_handlers.py:1676
-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:1697
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abonnerer nå på %s"
-
-#: ../src/common/connection_handlers.py:1699
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
-
-#: ../src/common/connection_handlers.py:1701
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abonnerer ikke lenger på %s"
-
-#: ../src/common/connection_handlers.py:1871
-#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å fjerne den"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Tilkobling til konto \"%s\" har blitt mistet"
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Automatisk tilkobling."
-
-#: ../src/common/connection.py:187
-#: ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Ugyldig svar"
-
-#: ../src/common/connection.py:405
-#: ../src/common/connection.py:440
-#: ../src/common/connection.py:898
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Kunne ikke koble til \"%s\""
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Tilkoblet til server %s:%s med %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Autentisering feilet med \"%s\""
-
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
-
-#: ../src/common/connection.py:495
-msgid "Error while removing privacy list"
-msgstr "Feil ved fjerning av liste over uønskede"
-
-#: ../src/common/connection.py:496
-#, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Desactivate it and try again."
-msgstr "Listen over utestengte %s har ikke blitt fjernet. Den er kanskje aktiv i en av dine tilkoblede ressurser. Deaktiver den og prøv igjen."
+"Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
-#. We didn't set a passphrase
-#: ../src/common/connection.py:594
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passordsetning ble ikke gitt"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:636
-msgid "invisible"
-msgstr "usynlig"
-
-#: ../src/common/connection.py:637
-msgid "offline"
-msgstr "frakoblet"
-
-#: ../src/common/connection.py:638
-#, python-format
-msgid "I'm %s"
-msgstr "Jeg er %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:729
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
-
-#: ../src/common/connection.py:785
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
+#. None
+#: ../src/vcard.py:325
 msgid ""
-"Subject: %s\n"
-"%s"
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr ""
-"Tittel: %s\n"
-"%s"
+"Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
+"han/hun i din."
 
-#: ../src/common/connection.py:924
-msgid "Not fetched because of invisible status"
-msgstr "Ikke hentet på grunn av usynlig status"
-
-#: ../src/common/contacts.py:271
-msgid "Not in roster"
-msgstr "ikke i kontaktliste"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindinger mangler på denne maskinen"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
-
-#: ../src/common/exceptions.py:30
-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:38
-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/vcard.py:332
+msgid "You are waiting contact's answer about your subscription request"
+msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Sesjons bussen er ikke tilgjengelig.\n"
-"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "en"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "to"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tre"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " ressurs med prioritet"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "fire"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP Kryptering"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "fem"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "seks"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "syv"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say "
+#~ "før teksten)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "åtte"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
+#~ "tredje person. (f.eks. /%s explodes.)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "ni"
+#~ msgid "Encryption enabled"
+#~ msgstr "Kryptering påslått"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "ti"
+#~ msgid "Encryption disabled"
+#~ msgstr "Kryptering avslått"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "elleve"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Repeter Passord:"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "tolv"
+#~ msgid "_Use proxy"
+#~ msgstr "_Bruk proxy"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "klokken $0"
+#~ msgid ""
+#~ "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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel "
+#~ "samtale klient (som iChat, Trillian eller Gaim) vil vises i "
+#~ "kontaktlisten. Du trenger ikke være koblet til en jabber server for at "
+#~ "det skal virke.\n"
+#~ "Dette er bare tilgjengelig dersom python-avahi er installert og avahi-"
+#~ "tjenesten kjører."
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem over $0"
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste "
+#~ "alle kontakter som om du hadde en konto"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ti over $0"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Slå på link-lokale meldinger"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart over $0"
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "ti på halv $1"
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo og Julie</small>"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fem på halv $1"
+#~ msgid "Old stories"
+#~ msgstr "Gamle historier"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "halv $1"
+#~ msgid "Soliloquy"
+#~ msgstr "Enetale"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "fem over halv $1"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "ti over halv $1"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvart på $1"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klikk for å se tidligere samtaler i dette rommet"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ti på $1"
+#~ msgid "Build custom query"
+#~ msgstr "Lag din egen spørring"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fem på $1"
+#~ msgid "Query Builder..."
+#~ msgstr "Spørrings Bygger..."
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1"
+#~ msgid "Accept"
+#~ msgstr "Godkjenn"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Natt"
+#~ msgid "Invitation Received"
+#~ msgstr "Invitasjon motatt"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Tidlig morgen"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Morgen"
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Grensenitt valg</b>"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Nesten formiddag"
+#~ msgid "Also known as iChat style"
+#~ msgstr "Også kjent som iChat stil"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Middag"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Et eksempel: Dersom du har slått på status melding for borte, så vil "
+#~ "Gajim ikke spør flere ganger etter melding når du endrer status til "
+#~ "borte; den vil bruke standard meldingen du lager her"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Ettermiddag"
+#~ msgid "Chat"
+#~ msgstr "Samtale"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Ettermiddag"
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Bestemt av sender\n"
+#~ "Samtale melding\n"
+#~ "Enkel melding"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Sen kveld"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "H_vert 5 minutt"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Starten av uken"
+#~ msgid "Events"
+#~ msgstr "Hendelser"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Midten av uken"
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr ""
+#~ "Gajim vil automatisk vise deg nye hendelser ved å sprette opp det "
+#~ "relative vinduet"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Slutten av uken"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
 
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Helg!"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på "
+#~ "skjermen om at en kontakt har akkurat logget inn"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Ugyldig karakter i brukernavn."
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim vil bare endre ikonet til kontakten som har sendt den nye hendelsen"
 
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Server adresse kreves."
+#~ 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 ""
+#~ "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
+#~ "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Ugyldig karakter i domene navn."
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Aldri\n"
+#~ "Alltid\n"
+#~ "Per konto\n"
+#~ "Per type"
 
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Ugyldig karakter i ressurs."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Utgående Samtale status opp_lysninger:"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "Print time:"
+#~ msgstr "Utskrifts tid:"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Sett status til å vise navnet på _musikk som spilles"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "Show only in _roster"
+#~ msgstr "Vis bare i _kontaktliste"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ msgid "The auto away status message"
+#~ msgstr "Den automatiserte borte meldinen"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "The auto not available status message"
+#~ msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Behandle alle innkommende meldinger som:"
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Opptatt"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Opptatt"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil "
+#~ "følgende metoder kunne bli brukt for å informere deg om det. Vennligst "
+#~ "merk at ny melding hendelser vil bare skje dersom du får en ny melding "
+#~ "fra en kontakt du ikke er i samtale med."
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_Ikke Tilgjengelig"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du "
+#~ "besøke http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Ledig for Samtale"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Avanserte Innstillinger for Hendelsesmeldinger..."
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Ledig for Prat"
+#~ msgid "_Font:"
+#~ msgstr "_Font:"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Tilgjengelig"
+#~ msgid "_Never"
+#~ msgstr "_Aldri"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Tilgjengelig"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Gi meg beskjed om det"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Kobler til"
+#~ msgid "_Player:"
+#~ msgstr "_Spiller:"
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "B_orte"
+#~ msgid "_Pop it up"
+#~ msgstr "_Sprett opp"
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Frakoblet"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Frakoblet"
+#~ msgid "Address"
+#~ msgstr "Adresse"
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "_Usynlig"
+#~ msgid "City:"
+#~ msgstr "By:"
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "?contact has status:Ukjent"
+#~ msgid "Company:"
+#~ msgstr "Bedrift:"
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "?contact has status:Har feilmeldinger"
+#~ msgid "Country:"
+#~ msgstr "Land:"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "?Subscription we already have:Ingen"
+#~ msgid "Given:"
+#~ msgstr "Fornavn:"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Til"
+#~ msgid "Middle:"
+#~ msgstr "Mellomnavn:"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Begge"
+#~ msgid "Position:"
+#~ msgstr "Plassering:"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "?Ask (for Subscription):Ingen"
+#~ msgid "Prefix:"
+#~ msgstr "Tittel:"
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Abonnér"
+#~ msgid "Role:"
+#~ msgstr "Rolle:"
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "?Group Chat Contact Role:Ingen"
+#~ msgid "State:"
+#~ msgstr "Fylke:"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Ordstyrere"
+#~ msgid "Suffix:"
+#~ msgstr "Suffix:"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Ordstyrer"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Deltakere"
+#~ msgid "A_ccounts"
+#~ msgstr "_Kontoer"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Deltaker"
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Besøkende"
+#~ msgid "Ask:"
+#~ msgstr "Spør:"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Besøk"
+#~ msgid "Client:"
+#~ msgstr "Klient:"
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Group Chat Contact Affiliation:Ingen"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Eier"
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Administrator"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så "
+#~ "vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør "
+#~ "du export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile "
+#~ "eller i den globale /etc/profile.\n"
+#~ "\n"
+#~ "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Medlem"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Hvert %s _minutt"
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "er fokusert på en annen samtale"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "gjør noe annet"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "skriver en melding..."
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s er nå %s (%s)"
 
-#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "tok pause i skriving av en melding"
+#~ msgid "%s is now %s"
+#~ msgstr "%s er nå %s"
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "har lukket samtalevinduet eller fanen"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Fra: %(from_address)s"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d ulest melding"
-msgstr[1] "%d uleste meldinger"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Manager støtte er ikke tilgjengelig"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d ulest enkelt melding"
-msgstr[1] "%d uleste enkelt meldinger"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d ulest gruppesamtale melding"
-msgstr[1] "%d uleste gruppesamtale meldinger"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Bruk: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d ulest privat melding"
-msgstr[1] "%d uleste private meldinger"
+#~ msgid "Private Chat"
+#~ msgstr "Privat Samtale"
 
-#: ../src/common/helpers.py:909
-#: ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "Group Chat"
+#~ msgstr "Gruppe Samtale"
 
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "feil: kan ikke åpne %s for lesing"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/optparser.py:188
-#: ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "turkis"
+#~ msgid "_New group chat"
+#~ msgstr "_Ny gruppe samtale"
 
-#: ../src/common/optparser.py:306
-msgid "migrating logs database to indices"
-msgstr "migrerer logg databaser til indekser"
+#~ msgid "_Log on"
+#~ msgstr "_Logg på"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim konto %s"
+#~ msgid "Log _off"
+#~ msgstr "Logg _av"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Tilkobling til maskinen kunne ikke opprettes: Feil svar fra serveren."
+#~ msgid "Save passphrase"
+#~ msgstr "Lagre passordsetning"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Tilkobling til maskin kunne ikke opprettes"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Slipp %s i samtalerom %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av data."
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
+#~ msgid "Affiliation:"
+#~ msgstr "Tilhørighet: "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "For å sende og motta meldinger må du koble til på nytt."
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Gjemmer knappene i to personers samtale vindu."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Avahi feil"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Link-lokal meldinger fungerer muligens ikke riktig."
+#~ msgid "invisible"
+#~ msgstr "usynlig"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Vennligst sjekk om Avahi er installert."
+#~ msgid "offline"
+#~ msgstr "frakoblet"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Kunne ikke starte lokal tjeneste"
+#~ msgid "I'm %s"
+#~ msgstr "Jeg er %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Klarer ikke å lytte til port %d."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d ulest enkelt melding"
+#~ msgstr[1] "%d uleste enkelt meldinger"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d ulest gruppesamtale melding"
+#~ msgstr[1] "%d uleste gruppesamtale meldinger"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Kunne ikke endre status til konto \"%s\""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d ulest privat melding"
+#~ msgstr[1] "%d uleste private meldinger"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke sendes."
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Denne meldingen er kryptert]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Tilkobling til maskinen kunne ikke opprettes: Feil svar fra serveren."
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Feil ved tilføying av tjeneste. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Tilkobling til maskin kunne ikke opprettes"
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "E_tter kallenavn:"
+
 #~ msgid "B_efore nickname:"
 #~ msgstr "F_ør kallenavn:"
+
 #~ msgid "_After time:"
 #~ msgstr "_Etter tid:"
+
 #~ msgid "_Before time:"
 #~ msgstr "_Før tid:"
-#~ msgid "_Publish"
-#~ msgstr "_Publisér"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Hent"
+
 #~ msgid "Information published"
 #~ msgstr "Informasjon publisert"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
+
 #~ msgid "_New room"
 #~ msgstr "Nytt Rom"
+
 #~ msgid "Role: "
 #~ msgstr "Rolle: "
-#~ msgid "Affiliation: "
-#~ msgstr "Tilhørighet: "
+
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
 #~ msgstr ""
 #~ "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 #~ "aktiv når notify_on_all_muc_messages er True)"
+
 #~ msgid "Add"
 #~ msgstr "Adresse"
+
 #~ msgid "Away "
 #~ msgstr "Borte"
+
 #~ msgid "Down"
 #~ msgstr "Last ned"
+
 #~ msgid "List of special notifications settings"
 #~ msgstr "Legg til Spesiell Alarm for %s"
+
 #~ msgid "Not Available "
 #~ msgstr "Ikke tilgjengelig"
+
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_Info"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ugyldig rom eller servernavn"
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Ukjent D-Bus versjon: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard publisering vellykket"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Din personlige informasjon har blitt publisert uten feil."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrerer Logger..."
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d ulest melding"
 #~ msgstr[1] "Gajim - %d uleste meldinger"
+
 #~ msgid "Since %s"
 #~ msgstr "Siden %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
+
 #~ msgid "Send File"
 #~ msgstr "Send Fil"
-#~ msgid "Underline"
-#~ msgstr "Strek Under"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "_Bli med i Nytt Rom"
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr ""
-#~ "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
+
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Vennligst velg ett av valgene under:</b>"
+
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Slett Melding for Dagen"
-#~ msgid "I want a notification popup:"
-#~ msgstr "Samtale status opp_lysninger:"
+
 #~ msgid "I want to listen to:"
 #~ msgstr "%s ønsker å sende deg en fil:"
+
 #~ msgid "Send _New Message..."
 #~ msgstr "Send _Ny Melding..."
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "Velg Melding for Dagen"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "Oppdater Melding for Dagen"
+
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsoll..."
-#~ msgid "Choose Avatar"
-#~ msgstr "Velg Bilde"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et samtale vindu"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et gruppe samtale vindu"
-#~ msgid "plain"
-#~ msgstr "enkel"
+
 #~ msgid "Send"
 #~ msgstr "Send"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s har sendt deg en ny melding."
+
 #~ msgid "GUI Migration failed"
 #~ msgstr "vCard publisering feilet"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Loggene ble migrert til databasen uten feil."
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
+
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start samtale med konto %s"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
+
 #~ msgid "Size: "
 #~ msgstr "Størrelse: "
+
 #~ msgid "Session bus is not available"
 #~ msgstr "Sesjons buss ikke tilgjengelig"
+
 #~ msgid "Sound"
 #~ msgstr "Lyd"
+
 #~ msgid "Image"
 #~ msgstr "Bilde"
-#~ msgid "From %s"
-#~ msgstr "Fra %s"
+
 #~ msgid "To %s"
 #~ msgstr "Til %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "Du har blitt invitert til %(room_jid)s rommet av %(contact_jid)s"
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "Behandle Uttrykksikoner"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "Eller velg en forhåndsvalgt melding:"
+
 #~ msgid "Use _emoticons"
 #~ msgstr "Bruk _uttrykksikoner"
+
 #~ msgid "_Set Image..."
 #~ msgstr "_Velg Bilde..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "Endre til %s"
+
 #~ msgid "using account "
 #~ msgstr "bruker konto"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "Filstørrelsen på bilde \"%s\" er for stor"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "Filen må ikke være mer enn 32 kilobyte."
+
 #~ msgid "Timeout"
 #~ msgstr "Tidsavbrudd"
+
 #~ msgid "account: "
 #~ msgstr "konto:"
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "Fjern valgte filoverføring"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "Stopp valgte filoverføring"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr ""
 #~ "Dersom du lukke denne fanen og du har slått av historikk, vil meldingen "
 #~ "bli borte."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan ikke fjerne den siste gruppen"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Du må ha minst en kontakt gruppe."
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6687,12 +10232,10 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #~ "installert pysqlite2, og om du ønsker å migrere loggene dine til den nye "
 #~ "databasen, vennligst les:http://trac.gajim.org/wiki/MigrateLogToDot9DB "
 #~ "Avslutter..."
-#~ msgid "Image is too big"
-#~ msgstr "Bilde er for stort"
+
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
 #~ msgstr ""
 #~ "Bilde for uttrykksikon må være mindre enn eller lik 24 piksler i bredde "
 #~ "og 24 i høyde."
-
diff --git a/po/nl.po b/po/nl.po
index 7c0fc1e4c..7b9720c87 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,14 +3,13 @@
 # Copyright (C) 2005 GAJIM'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gajim package.
 # Stéphan Kochen <stephan@kochen.nl>, 2005.
-# 
-# 
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+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"
@@ -34,46 +33,54 @@ 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 "Send Single _Message..."
-msgstr "Enkel _Bericht Verzenden"
+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
-msgid "_Discover Services..."
-msgstr "Ontdek Services..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Groupsgesprek"
-
-#: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
+#, fuzzy
+msgid "_Modify Account"
 msgstr "Account Be_werken..."
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:6
 #, 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -86,55 +93,81 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klik om mogelijkheden (zoals MSN, ICQ transporten) van jabber servers te zien"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Verbind zodra ik Afronden druk"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Wizard Account Aanmaken"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "_Wachtwoord:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Beheer..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Server Mogelijkheden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 #, 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:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Gebruik aangepaste hostnaam/poort"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -142,68 +175,64 @@ msgstr ""
 "Je hebt een account nodig om verbinding te maken\n"
 "met het Jabber netwerk."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Jouw JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Host:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Hostnaam: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#, fuzzy
-msgid "_Retype Password:"
-msgstr "_Wachtwoord:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Gebruik proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Overige</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persoonlijke Informatie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Account"
 
@@ -212,19 +241,29 @@ msgid "Account Modification"
 msgstr "Account Wijziging"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "_Administrator"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Verander Wachtwoord"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -235,58 +274,77 @@ msgstr ""
 "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:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Kies _Sleutel..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klik om het wachtwoord van de account te veranderen"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Algemeen"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Hostnaam: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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 ""
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
 "Indien aangevinkt zal Gajim keep-alive-paketten sturen om de verbinding in "
 "stand te houden"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -295,7 +353,8 @@ msgstr ""
 "Indien aangevinkt zal Gajim wachtwoorden opslaan in ~/.gajim/config met "
 "alleen leesrechten voor allen jou"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -304,7 +363,8 @@ msgstr ""
 "Indien aangevinkt zal Gajim automatisch verbinding maken met deze account "
 "bij het opstarten"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -315,44 +375,49 @@ msgstr ""
 "lijstknop onderaan het roostervenster) de status van deze account "
 "meeveranderen."
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Beheer..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Geen"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Poort: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priori_teit"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -362,19 +427,23 @@ msgstr ""
 "ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
 "prioriteit wint."
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+#, fuzzy
+msgid "Resour_ce:"
 msgstr "_Bron: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -387,88 +456,161 @@ 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:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Sla _wachtwoord op (onveilig)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Sla gespreks_logboek op voor alle contacten"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Gebruik aangepaste hostnaam/poort"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "bestandsoverdrachtlijst"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "_Naam: "
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Eigenschappen</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Inschakelen"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, 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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ""
-"Indien aangevinkt en je twee of meer accounts hebt, zal Gajim de contacten "
-"van alle accounts samenvoegen alsof ze een grote account zijn."
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Naam:"
+
+#: ../data/glade/accounts_window.glade.h:35
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "Accounts _samenvoegen"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Her_noem"
+
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "Be_werk"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Verwijder"
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
@@ -490,7 +632,7 @@ msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
 #: ../data/glade/add_new_contact_window.glade.h:5
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -529,7 +671,7 @@ msgstr "Gebruikers ID:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
 #, fuzzy
-msgid "<b>An error has occured:</b>"
+msgid "<b>An error has occurred:</b>"
 msgstr "Een protocolfout is opgetreden:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -568,11 +710,12 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Beschrijving</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
@@ -592,45 +735,46 @@ msgid "Deletes Message of the Day"
 msgstr "Zal het Bericht van de Dag wissen"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "Stuurt een bericht naar gebruikers momenteel verbonden met deze server"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Start Gesprek"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Stel MOTD in"
+#, 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
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Stel MOTD in"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "_XML Console Weergeven"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "MOTD Bijwerken"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Werkt Bericht van de Dag bij"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr ""
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "Ver_stuur Server Bericht"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "Ver_stuur Enkel Bericht"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
@@ -646,7 +790,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Geluiden</b>"
 
@@ -666,7 +810,7 @@ msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Afwezig"
 
@@ -684,7 +828,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -694,7 +838,7 @@ msgid "Launch a command"
 msgstr "commando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
@@ -715,126 +859,137 @@ msgstr "Speel _geluiden af"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.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:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:34
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Gebruik enkel gespreksvenster met _tabs"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 #, fuzzy
 msgid "for "
 msgstr "Poort: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Entry:"
 msgstr "Land:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "thema naam"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Naam:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "_Inhoud"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:9
-msgid "You have received new entry:"
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
 msgstr ""
 
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Geluiden</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
@@ -867,10 +1022,9 @@ msgid "Join _Group Chat"
 msgstr "Neem deel aan _Groepsgesprek"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Toevoegen aan Roster"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -890,39 +1044,70 @@ msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klik om de gespreksgeschiedenis van deze contact te bekijken"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "_Inhoud"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "_Bestand Verzenden"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Schakel Open_PGP Codering om"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Schakel Open_PGP Codering om"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Compacte Weergave    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Toevoegen aan Roster"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Geschiedenis"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Onzichtbaar"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Server"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -936,6 +1121,24 @@ msgstr "Ruimte Configuratie"
 msgid "Edit Groups"
 msgstr "Wijzig Groepen"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Beschrijving</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Server Mogelijkheden"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
@@ -971,13 +1174,15 @@ msgid "Remove file transfer from the list."
 msgstr "Verwijder bestandsoverdracht van de lijst."
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, 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
-msgid "Shows a list of file transfers between you and other"
+#, 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
@@ -992,7 +1197,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Verder"
 
@@ -1000,7 +1205,7 @@ msgstr "_Verder"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Open Bovenliggende Map"
 
@@ -1050,7 +1255,7 @@ msgstr "Gajim Themas Aanpassen"
 msgid "Gone"
 msgstr "Geen"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 #, fuzzy
 msgid "Inactive"
 msgstr "Actief"
@@ -1089,58 +1294,72 @@ msgid "_Background:"
 msgstr "_Achtergrond:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Verander Bij_naam"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Verander _Onderwerp"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klik om de gespreksgeschiedenis van deze ruimte te bekijken"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Configureer _Ruimte"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Configureer _Ruimte"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "_Beheerder"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Gebruiker Acties"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Lid"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Gebruiker Acties"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Eigenaar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Stem"
 
@@ -1148,107 +1367,106 @@ msgstr "_Stem"
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Van"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 #, fuzzy
 msgid "Subject"
 msgstr "Onderwerp:"
 
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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:7
+#: ../data/glade/history_manager.glade.h:3
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr ""
+
+#: ../data/glade/history_manager.glade.h:4
 #, fuzzy
 msgid "Delete"
 msgstr "Wis MOTD"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr ""
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 #, fuzzy
 msgid "_Search Database"
 msgstr "_Zoek"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Bouw aangepaste query"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Query Bouwer..."
-
-#: ../data/glade/history_window.glade.h:4
-#, fuzzy
-msgid "Search"
-msgstr "_Zoek"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
+#, fuzzy
+msgid "Search:"
 msgstr "_Zoek"
 
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Accepteer"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Weigeren"
-
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Uitnodiging Ontvangen"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "Gespreksgeschiedenis"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Bijnaam:"
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "Bijnaam:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Recent:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -1270,19 +1488,38 @@ msgstr ""
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 #, fuzzy
 msgid "Print status:"
 msgstr "Print tijd:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titel:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Ruimte Configuratie"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Eigenschappen</b>"
@@ -1292,47 +1529,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instellingen</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "HTTP Verbinden"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Naam:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Wachtwoord:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Type:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Gebruik aanmelding"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host:"
+
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klik om een emoticon in te voegen (Alt+E)"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Voegt contact toe aan rooster"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Versleuteling"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Acties"
+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"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "Ver_stuur"
 
@@ -1348,42 +1623,78 @@ msgstr "<b>Geavanceerde Instellingen Wijzigen</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Toepassingen</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Toepassingen</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Aangepast</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
 #, fuzzy
-msgid "<b>GMail Options</b>"
-msgstr "<b>Toepassingen</b>"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Visuele Meldingen</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Interface Aanpassingen</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Aangepast</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Geluiden</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+#, fuzzy
+msgid "<b>GMail Options</b>"
+msgstr "<b>Toepassingen</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuele Meldingen</b>"
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<b>Eigenschappen</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
 #, fuzzy
-msgid "A_fter nickname:"
-msgstr "Na bijnaam:"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Eigenschappen</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visuele Meldingen</b>"
+
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Geavanceerd"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1393,47 +1704,28 @@ msgstr ""
 "Alleen bij typen van bericht\n"
 "Uitgeschakeld"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:25
 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:19
-msgid "Also known as iChat style"
-msgstr "Ook bekend als iChat-stijl"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Automatisch _afwezig na:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Automatisch _niet beschikbaar na:"
-
 # deelnemen?
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Herken automatisch als Gajim opstart\n"
@@ -1441,73 +1733,58 @@ msgstr ""
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:32
 #, fuzzy
-msgid "B_efore nickname:"
-msgstr "Voor bijnaam:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Gesprek"
+msgid "Chat message:"
+msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"Vink deze optie alleen aan als iemand niet op je rooster je spamt of "
-"lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
-"contacten niet op je rooster geblokkeerd"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
-msgid "Default Status Messages"
-msgstr "Statusbericht"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
-msgid "Default status _iconset:"
-msgstr "Standaard _status iconenset:"
+msgid "Display _activity of contacts in roster"
+msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:42
 #, fuzzy
-msgid "Display a_vatars of contacts in roster"
+msgid "Display _tunes of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:37
-#, fuzzy
-msgid "Display status _messages of contacts in roster"
-msgstr "Statusberichten van contacten weergeven in het rooster"
-
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
-msgid "Displayed Chat state noti_fications:"
-msgstr "Gesprekstoestands _mededelingen:"
+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:39
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
-msgid "E_very 5 minutes"
-msgstr "Elke 5 _minuten"
+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:40
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
-msgid "Emoticons:"
-msgstr "Beheer Emoticons"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Gebeurtenissen"
+msgid "Display status _messages of contacts in roster"
+msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1515,7 +1792,7 @@ msgid ""
 "display in chat windows."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1523,51 +1800,50 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:44
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
-"Gajim will automatically show new events by poping up the relative window"
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
-"Gajim zal automatisch nieuwe berichten in een nieuw venster of tab in een "
-"bestaand venster laten zien"
+"Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
+"in beeld"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
+msgid "Hide all buttons in chat windows"
 msgstr ""
-"Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
 msgstr ""
-"Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
-"rechtsonder in beeld"
+"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
+"tijdens het opstarten"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
 msgstr ""
-"Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
-"in beeld"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim zal alleen het contacticoon veranderen bij nieuwe berichten"
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
+"weergeven"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
+"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:51
+#: ../data/glade/preferences_window.glade.h:55
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1576,7 +1852,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1585,259 +1861,301 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Indien aangevinkt zal Gajim de positie en grootte van vensters onthouden "
-"voor de volgende keer dat ze geopend worden"
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Indien aangevinkt zal Gajim iconen gebruiken die bij het protocol horen. "
-"(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
-"status online, afwezig, bezig, enz...)"
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
-"bijpassende grafische emoticons"
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
 
-#: ../data/glade/preferences_window.glade.h:56
-msgid "Ignore rich content in incoming messages"
+#: ../data/glade/preferences_window.glade.h:60
+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:57
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
-msgid "Ma_nage..."
-msgstr "Beheer..."
-
-#: ../data/glade/preferences_window.glade.h:58
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
 msgstr ""
+"Vink deze optie alleen aan als iemand niet op je rooster je spamt of "
+"lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
+"contacten niet op je rooster geblokkeerd"
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "Geef mij bericht over contacten die: "
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "Notify on new _GMail email"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "Bij elk _bericht"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Indien aangevinkt zal Gajim iconen gebruiken die bij het protocol horen. "
+"(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
+"status online, afwezig, bezig, enz...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-#, fuzzy
-msgid "One message _window:"
-msgstr "Bericht verzenden en venster sluiten"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Gesprekstoestands _mededelingen:"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
+"bijpassende grafische emoticons"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Play _sounds"
-msgstr "Speel _geluiden af"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "Voorkeuren"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Bericht verzenden en venster sluiten"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Print tijd:"
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Beheer..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr "Sla _positie en grootte op voor rooster- en gespreksvensters"
+#, fuzzy
+msgid "Notifications"
+msgstr "Account Wijziging"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Geef mij bericht over contacten die: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Alleen in _rooster weergeven"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Geef mij bericht over contacten die: "
 
 #: ../data/glade/preferences_window.glade.h:73
+msgid "Notify on new _GMail email"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Persoonlijke Informatie"
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "Speel _geluiden af"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:82
 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:76
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Sorteer contacten op status"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:85
 #, fuzzy
-msgid "T_heme:"
-msgstr "Thema:"
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "Het statusbericht voor automatische afwezigheid"
-
-#: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "Het statusbericht voor automatisch niet beschikbaar"
-
-#: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
-msgstr "Gebruik _transport iconensets"
-
-#: ../data/glade/preferences_window.glade.h:81
-msgid "Use system _default"
-msgstr ""
+msgid "Status _iconset:"
+msgstr "Standaard _status iconenset:"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:86
 #, fuzzy
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Icoon in mededelingsgebied"
+msgid "Style"
+msgstr "Vastgelopen"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
+msgid "T_heme:"
+msgstr "Thema:"
+
+#: ../data/glade/preferences_window.glade.h:88
 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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
 msgstr ""
-"Als een nieuwe gebeurtenis (bericht, bestandsoverdracht, enz.) ontvangen is, "
-"kunnen de volgende methoden gebruikt worden om je te informeren. LET OP: "
-"Nieuwe bericht-gebeurtenissen treden alleen op als het een nieuw bericht is "
-"van een contact waar je nog geen gesprek mee hebt"
-
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
-msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
-msgid "_Advanced Notifications Control..."
-msgstr "Geavanceerde Configuratie Wijzigen"
+msgid "Use _transports icons"
+msgstr "Gebruik _transport iconensets"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
+msgid "Use system _default"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
-msgid "_After time:"
-msgstr "Na tijdsstempel:"
+msgid "When new event is received:"
+msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
-msgid "_Before time:"
-msgstr "Voor tijdsstempel:"
+msgid "_Away after:"
+msgstr "Automatisch _afwezig na:"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:95
 #, fuzzy
-msgid "_File manager:"
-msgstr "Bestandsbeheerder:"
+msgid "_Display chat state notifications:"
+msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:96
 #, fuzzy
-msgid "_Font:"
-msgstr "Lettertype:"
+msgid "_Emoticons:"
+msgstr "Beheer Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:97
+#, fuzzy
+msgid "_File manager:"
+msgstr "Bestandsbeheerder:"
+
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:99
 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:94
+#: ../data/glade/preferences_window.glade.h:100
+msgid "_Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Binnenkomend bericht:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Nooit"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Stel mij ervan op de hoogte"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Uitgaand bericht:"
 
-#: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "_Speler:"
-
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "_Opduiken"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
-msgid "_Sort contacts by status"
-msgstr "Sorteer contacten op status"
+msgid "_Send chat state notifications:"
+msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Neem deel aan _Groepsgesprek"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "niet in het rooster"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minuten"
 
@@ -1876,6 +2194,10 @@ msgstr ""
 msgid "Allow"
 msgstr ""
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Weigeren"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
@@ -1886,7 +2208,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr ""
 
@@ -1927,154 +2249,181 @@ msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 msgid "to view my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Info"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Stel Contact_afbeelding in"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adres"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Verjaardag:"
 
 #: ../data/glade/profile_window.glade.h:4
+#: ../data/glade/vcard_information_window.glade.h:5
 #, fuzzy
-msgid "Avatar:"
-msgstr "Stel Contact_afbeelding in"
+msgid "<b>City:</b>"
+msgstr "<b>Aangepast</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Verjaardag:"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Stad:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Bedrijf:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Afdeling:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Extra Adres:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Familie:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Formaat: YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Aangepast</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Voornaam:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Homepage:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Aangepast</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Bijnaam:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Middelste naam:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefoonnummer:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Meer"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Geluiden</b>"
+
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, 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:31
+#: ../data/glade/vcard_information_window.glade.h:27
 #, fuzzy
-msgid "Personal Info"
-msgstr "Persoonlijke Informatie"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Eigenschappen</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefoonnummer:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Instellingen</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Positie:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Postcode:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Instellingen</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Voorvoegsel:"
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Rol:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Info"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Staat:"
+msgid "Click to set your avatar"
+msgstr ""
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Straat:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formaat: YYYY-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Achtervoegsel:"
+#: ../data/glade/vcard_information_window.glade.h:47
+#, fuzzy
+msgid "Personal Info"
+msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Werk"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Publiceren"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Haal op"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Wat wil je doen?</b>"
@@ -2087,82 +2436,132 @@ msgstr "Verwijder account alleen van Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Verwijder"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "A_sk to see his/her status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
-msgid "Add Special _Notification"
+msgid "Add Special _Notification..."
 msgstr "<b>Visuele Meldingen</b>"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Wijs Open_PGP Sleutel toe"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Wijzig _Groepen"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr ""
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enkel _Bericht Verzenden"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Verwijder"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+#, fuzzy
+msgid "Send Single _Message..."
+msgstr "Enkel _Bericht Verzenden"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "_Bestand Verzenden"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Verbiedt hem/haar mijn status te zien"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Verwijder van Rooster"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "_Inhoud"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Hernoem"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Abonnement"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Verder"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "A_ccounts"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Contact Toevoegen..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "_Contact Toevoegen"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Server Mogelijkheden"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2176,54 +2575,95 @@ msgstr "Veel Gestelde Vragen (online)"
 msgid "Help online"
 msgstr "Hulp online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Profiel, Contactafbeelding"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transporten"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "_Rooster Weergeven"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Inhoud"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Accounts"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "Ontdek Services"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Acties"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Inhoud"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Enkel _Bericht Verzenden"
+
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_View"
 msgstr "_Stem"
 
+#: ../data/glade/search_window.glade.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
+#, fuzzy
+msgid "Search"
+msgstr "_Zoek"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "_Contact Toevoegen"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Contact Informatie"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Zoek"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "Ga"
@@ -2232,10 +2672,6 @@ msgstr "Ga"
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registreer naar"
@@ -2294,13 +2730,17 @@ msgid "Au_thorize"
 msgstr "_Toestemmen"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, 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
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, 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
@@ -2311,11 +2751,32 @@ msgstr "Abonneringsverzoek"
 msgid "_Deny"
 msgstr "_Weigeren"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
@@ -2328,59 +2789,75 @@ msgstr "_Rooster Weergeven"
 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:5
-msgid "Ask:"
-msgstr "Vraag:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Toepassingen</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Client:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Bron:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Instellingen</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Beschrijving</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Aangepast</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 #, fuzzy
 msgid "Comments"
 msgstr "Commentaar: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Configureer _Ruimte"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "_Inhoud"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Contact Informatie"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "Besturingssysteem:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Bron:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Abonnement:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Meer"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "Gespreksgeschiedenis"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Kies een Contactafbeelding"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2390,11 +2867,6 @@ msgstr "<b>Jabber Verkeer</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Invoer</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Inschakelen"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2413,17 +2885,30 @@ msgstr "_Bericht"
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
-msgid "First Name:"
-msgstr "Naam:"
+msgid "Add Special _Notification"
+msgstr "<b>Visuele Meldingen</b>"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-#, fuzzy
-msgid "Last Name:"
-msgstr "Naam:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Wijs Open_PGP Sleutel toe"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Wijzig _Groepen"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Hernoem"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "Account Be_werken..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2434,218 +2919,417 @@ msgstr ""
 msgid "Personal"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Bron:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 #, fuzzy
 msgid "Modify Account"
 msgstr "Account Be_werken..."
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
+#: ../src/adhoc_commands.py:264
 #, fuzzy
-msgid "Use custom port:"
-msgstr "Gebruik aangepaste hostnaam/poort"
+msgid "Cancel confirmation"
+msgstr "Contact Informatie"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
-#: ../src/advanced.py:57
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "Actief"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "Actief"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "In de groep"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr "Tekst"
+
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
+
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Voorkeur Naam"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Niets)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Verborgen"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+msgid "Belarusian"
+msgstr ""
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "German"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Greek"
 msgstr "groen"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+msgid "British"
+msgstr ""
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Croatian"
 msgstr "Locatie"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Italian"
 msgstr "Schuingedrukt"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Polish"
 msgstr "_Publiceren"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Algemeen"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Als dit niet de taal is waarvoor je spelfouten wilt aanmerken, stel dan "
-"$LANG opnieuw in op jouw taal. Bijv. voor frans doe je export LANG=fr_FR of "
-"export LANG=fr_FR.UTF-8 in ~/.bash_profile of in /etc/profile als je het "
-"systeem globaal op frans wilt instellen.\n"
-"\n"
-"De markering van spelfouten zal niet worden gebruikt."
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:844
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 #, fuzzy
-msgid "Chats"
-msgstr "Gesprek"
+msgid "GPG encryption enabled"
+msgstr "Versleuteling ingeschakeld"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "niet in het rooster"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
 
-#: ../src/chat_control.py:1030
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+
+#: ../src/chat_control.py:1438
 #, 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."
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Versleuteling uitgeschakeld"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Gebruik aanmelding"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Gebruik aanmelding"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
+#, python-format
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
+
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Commando's: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, fuzzy, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, fuzzy, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
 msgstr ""
-"%s heeft geen OpenPGP sleutel uitgezonden en je hebt er geen toegewezen"
+"Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
+"gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "Versleuteling ingeschakeld"
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Geen hulp beschikbaar voor /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Dit bericht is versleuteld]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "niet in het rooster"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Dit bericht is versleuteld]"
+
+#: ../src/chat_control.py:1854
+#, 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:1545
+#: ../src/chat_control.py:2225
 #, 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:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2653,333 +3337,2875 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s is nu %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "logboek database wordt aangemaakt"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s is een bestand, maar een map werd verwacht"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim sluit nu af"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s is een map, maar een bestand werd verwacht"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "map %s wordt aangemaakt"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Contact Informatie"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Contact is Uitgelogd"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Open voor Gesprek"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "_Verder"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr ""
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Beschrijving"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Groupsgesprek"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr ""
+"%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "In de groep"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Groupsgesprek"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Je bent al in ruimte %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "Gajim - één ongelezen bericht"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Afwezig vanwege inactiviteit"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr ""
+"Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Niet beschikbaar vanwege inactiviteit"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Wis MOTD"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr ""
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
+"dat * * verwijdert wordt."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Voeg * en [n] toe aan roster titel?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
+"venster heropend wordt."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
+"(Standaard gedrag van Mirabilis ICQ)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
+"'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/common/config.py:186
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/common/config.py:187
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
+"van een NAT of port forwarding."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Laat tabs zien bij slechts één gesprek?"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Laat tab rand zien bij slechts één gesprek?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Laat sluit knop zien in tabs?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Gesprekstoestands _mededelingen:"
+
+#: ../src/common/config.py:218
+#, fuzzy
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Een puntkomma-onderbroken lijst van woorden die oplichten in een "
+"groepsgesprek"
+
+#: ../src/common/config.py:219
+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 ""
+"Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
+"alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
+"berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
+
+#: ../src/common/config.py:222
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
+"naam in het roostervenster, indien deze niet leeg is"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
+"geen bekend is, of de laatste afbeelding te oud is."
+
+#: ../src/common/config.py:229
+#, fuzzy
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
+"wanneer een contact zijn/haar status aanpassen."
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr ""
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+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"
+"'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."
+msgstr ""
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr ""
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window"
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr ""
+
+#: ../src/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat occupants list in group chat window."
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Bericht verzenden en venster sluiten"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Een puntkomma-onderbroken lijst van woorden die oplichten in een "
+"groepsgesprek"
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP is niet bruikbaar op deze computer"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Slapen"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Zo terug"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "In een paar minuten terug."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Eten"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Ik ben aan het eten, laat een bericht achter."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Ik been een film aan het kijken."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Werken"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Ik ben aan het werk."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefoon"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Ik ben aan het telefoneren."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Uit"
+
+#: ../src/common/config.py:421
+#, fuzzy
+msgid "I'm out enjoying life."
+msgstr "Ik ben uit van het leven genieten"
+
+#: ../src/common/config.py:425
+#, fuzzy
+msgid "I'm available."
+msgstr "Aanwezig"
+
+#: ../src/common/config.py:426
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Open voor Gesprek"
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr ""
+
+#: ../src/common/config.py:428
+#, fuzzy
+msgid "I'm not available."
+msgstr "Niet Beschikbaar"
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:441
+#, fuzzy
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
+"woorden in much_highlight_words bevat."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr ""
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "groen"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "kruidenier"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "menselijk"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marine"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy
+msgid "Wrong host"
+msgstr "Wachtwoord"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+msgid "Invisibility not supported"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Bijnaam niet gevonden: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Je bent uit deze ruimte verbannen."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Die ruimte bestaat niet."
+
+#: ../src/common/connection_handlers.py:2060
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Ruimte creatie is beperkt."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Je staat niet in de ledenlijst"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Machtiging is verwijdert"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "we zijn nu op %s geabonneert"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "afmelding verzocht van %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "we zijn nu van %s afgemeld"
+
+#: ../src/common/connection_handlers.py:2343
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan jouw "
+"rooster. Gebruik een roostermanagement applicatie zoals http://jru."
+"jabberstudio.org/ om het te verwijderen"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP wachtwoord niet opgegeven"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Je zult verbonden worden met %s zonder OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Verbinding met account \"%s\" verbroken"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr ""
+
+#: ../src/common/connection.py:278
+#, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Onbekende D-Bus versie: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Ongeldig wachtwoord"
+
+#: ../src/common/connection.py:341
+#, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Verbinding"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kon geen verbinding maken met \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Controleer de verbinding of probeer later nogmaals."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Kon geen verbinding maken met \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Verbinding met account \"%s\" verbroken"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Onbekende D-Bus versie: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Controleer je verbinding of probeer later nogmaals"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Inloggen mislukt met \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Controleer gebruikersnaam en wachtwoord."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "fout tijdens versturen"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Dit bericht is versleuteld]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Onderwerp: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transporten"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "niet in het rooster"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python koppeling ontbreekt op deze computer"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Account naam kan niet leeg zijn."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Geen"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Straat:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Poort: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "bestand"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Gebeurtenis"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Verder"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Wis MOTD"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "Registreer met %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+#, fuzzy
+msgid "Morning"
+msgstr "Werken"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Noon"
+msgstr "Geen"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Evening"
+msgstr "Gebeurtenis"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Ongeldig character in gebruikersnaam."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Server adres vereist."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Ongeldig character in hostnaam."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Ongeldig character in bron."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Bezig"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Bezig"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Niet Beschikbaar"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "Open voor _Gesprek"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Open voor Gesprek"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Aanwezig"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Aanwezig"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Bezig met verbinden"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "Af_wezig"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Offline"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Offline"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "Onz_ichtbaar"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Onbekend"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Heeft fouten"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Geen"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Aan"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Beide"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Geen"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Abonneren"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Geen"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Beheerders"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Beheerder"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Deelnemers"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Deelnemer"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Bezoekers"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Bezoeker"
+
+#: ../src/common/helpers.py:358
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Role:Geen"
+
+#: ../src/common/helpers.py:360
+#, fuzzy
+msgid "Owner"
+msgstr "_Eigenaar"
+
+#: ../src/common/helpers.py:362
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrator"
+
+#: ../src/common/helpers.py:364
+#, fuzzy
+msgid "Member"
+msgstr "_Lid"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "let op deze conversatie"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "is met iets anders bezig"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "is een bericht aan het typen..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "pauzeert tijdens het typen van een bericht"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "heeft het gespreksvenster of -tab gesloten"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Bericht verzenden"
+msgstr[1] "Bericht verzenden"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "Van %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "Van %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "Van %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "fout: kan %s niet voor lezen openen"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyaan"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "logboek database wordt aangemaakt"
+
+#: ../src/common/passwords.py:92
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "voor account %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Gepauzeerd"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Vetgedrukt"
+
+#: ../src/common/pep.py:38
+msgid "Brave"
+msgstr ""
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Gesprek"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Vetgedrukt"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Inhoud"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Afgerond"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Inhoud"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Actief"
+
+#: ../src/common/pep.py:49
+msgid "Curious"
+msgstr ""
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Wis MOTD"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+msgid "Disappointed"
+msgstr ""
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+msgid "Dismayed"
+msgstr ""
+
+#: ../src/common/pep.py:55
+msgid "Distracted"
+msgstr ""
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Groep"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "bericht"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Onzichtbaar"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "Geen"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Algemeen"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "Be_werk"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Groep"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "Wis MOTD"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Vastgelopen"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Naam:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Uit_schoppen"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Slapen"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Straat:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Abonneren"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tijd"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Onderstreept"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Wachtwoord"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Gebeurtenis"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Werken"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Werken"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "In de groep"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Werken"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
 msgstr ""
 
-#: ../src/config.py:221
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Gebeurtenis"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "%s uit de ruimte schoppen"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Binnengaan"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Werken"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Werken"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Eten"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Onderwerp Veranderen"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "%s uit de ruimte schoppen"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Eten"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Werken"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "simpel"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "%s uit de ruimte schoppen"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Eten"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Uitloggen"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Eten"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Eten"
+
+#: ../src/common/pep.py:167
+msgid "Rehearsing"
+msgstr ""
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Slapen"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Werken"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Eten"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Ik been een film aan het kijken."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Eten"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Ik ben aan het telefoneren."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Verzenden"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Bezig met verbinden"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+msgid "On a Train"
+msgstr ""
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Werken"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Verbinding"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Werken"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, fuzzy, python-format
+msgid "Unable to bind to port %s."
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Om verdere berichten te versturen en ontvangen, moet je de verbinding "
+"opnieuw in stand brengen."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Elke %s _minuten"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr ""
 
-#: ../src/config.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kon geen verbinding maken met \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Dit bericht is versleuteld]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "fout tijdens versturen"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr ""
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Statusbericht"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Inschakelen"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Aangepast</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, 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:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1074
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Nieuw Bericht"
+
+#: ../src/config.py:1056
 #, fuzzy
-msgid "Next Message Received"
+msgid "Next Message Received Unfocused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1057
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Naam"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1693
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Je hebt geen actieve account"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 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:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr ""
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 #, 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:1344
+#: ../src/config.py:1716
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Beheer Accounts"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 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:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr ""
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
+"Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:1566
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
+#: ../src/config.py:2076
+#, fuzzy
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Kies je OpenPGP sleutel"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 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:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 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:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 #, 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:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Kon de geheime sleutel niet ophalen"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr ""
-"Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
-
-#: ../src/config.py:1634 ../src/config.py:3427
-#, fuzzy
-msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Versleuteling"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Kies je OpenPGP sleutel"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Naam"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr ""
-
-#: ../src/config.py:1969
-#, fuzzy, python-format
-msgid "You have opened chat in account %s"
-msgstr "Je hebt geen actieve account"
-
-#: ../src/config.py:1970
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr ""
-
-#: ../src/config.py:2029
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
 #, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2989,386 +6215,503 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Print tijd:"
+
+#: ../src/config.py:2758
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2749
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Zorg ervoor dat de server- en ruimtevelden ingevuld zijn, of verwijder deze "
 "bladwijzer."
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "Ongeldig wachtwoord"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "Wachtwoord komt niet overeen"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "De wachtwoorden in beide velden moeten identiek zijn"
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 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:3100
-msgid "Your new account has been created successfully"
-msgstr "Je nieuwe account is met succes aangemaakt"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Contact staat al in het rooster"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Je nieuwe account is met succes aangemaakt"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:678
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM Client"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Stel MOTD in"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Statusbericht"
+
+#: ../src/dialogs.py:673
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+
+#: ../src/dialogs.py:682
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:906
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Niet in staat de ruimte binnen te gaan"
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 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:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, 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:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Account \"%s\" heeft verbinding met de server"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr ""
+"Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
+"zijn."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3378,279 +6721,386 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Ongeldig wachtwoord"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Wachtwoord komt niet overeen"
+
+#: ../src/dialogs.py:2025
+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:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1887
+#: ../src/dialogs.py:2628
 #, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2633
 #, fuzzy, python-format
-msgid "Order: %s, action: %s"
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Je bent uit deze ruimte verbannen."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
+
+#: ../src/dialogs.py:2968
 #, fuzzy, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Overigen"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transporten"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 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:497
+#: ../src/disco.py:514
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3658,208 +7108,470 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 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:728
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/disco.py:754
 #, fuzzy, python-format
-msgid "Browsing %s using account %s"
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "via account %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "commando"
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Geen"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "_Geschiedenis"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "_Bericht"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+msgid "Idle"
+msgstr ""
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP Versleuteling"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Binnenkomend bericht:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Algemeen"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Server Mogelijkheden"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Bestand"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tijd"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Jij"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "Bestandsoverdracht gestopt door andere gebruiker"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Beschrijving: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Sla Bestand op als..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3867,60 +7579,70 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ongeldig Bestand"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Bestand: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3928,23 +7650,23 @@ msgid ""
 msgstr ""
 "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 #, 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:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3952,226 +7674,459 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Wachtwoord Vereist"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:494
+#, 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"
+
+#. ask again
+#: ../src/gajim.py:509
+#, fuzzy
+msgid "Wrong Passphrase"
+msgstr "Wachtwoord"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
+"gebruiker.\n"
+"Geef een andere bijnaam op:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Neem je dit verzoek aan?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gajim.py:706
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Onderwerp: %s\n"
+msgid "Error %(code)s: %(msg)s"
+msgstr "Fout bij lezen bestand:"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, fuzzy, python-format
-msgid "error while sending %s ( %s )"
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "Je zult hem altijd als offline zien."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Controleer de verbinding of probeer later nogmaals."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s is nu bekend als %s"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s is nu %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "Je wachtwoord is incorrect"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Je wachtwoord is incorrect"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Bij elk _bericht"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Bron: "
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Verbinding"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+#, fuzzy
+msgid "Do _not ask me again"
+msgstr "Vraag mij dit niet nogmaals"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Versleuteling uitgeschakeld"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:2090
-#, fuzzy
-msgid "Network Manager support not available"
-msgstr "Er is geen verbinding beschikbaar"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bladwijzer bestaat al"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
+#: ../src/gajim.py:2998
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Ruimte \"%s\" heeft al een bladwijzer."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
+
+#: ../src/gajim-remote.py:79
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "laat hulp zien voor een specifiek commando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 #, fuzzy
-msgid "Popups a window with the next pending event"
+msgid "Pops up a window with the next pending event"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Drukt een lijst af van contacten in het rooster. Elke contact komt op een "
 "aparte regel"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "bericht"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4180,23 +8135,23 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Laat het gespreksvenster zien zodat je berichten kunt versturen aan een "
 "contact"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "Indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4207,28 +8162,30 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp sleutel"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -4239,111 +8196,120 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID of contact die het bericht zal ontvangen"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
 "ingesteld"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige staat van de Gajim voorkeuren weg naar het .config "
 "bestand"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Voegt een nieuwe contact toe aan deze account"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:231
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -4351,40 +8317,104 @@ msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:238
 #, fuzzy
-msgid "Returns number of unreaded messages"
+msgid "Returns number of unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "XML to send"
 msgstr "XML Console"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "Nieuwe Ruimte _Binnengaan"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "Van"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Ruimte:"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "Uit_schoppen"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "Wachtwoord:"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Wachtwoord komt niet overeen"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+msgid "Check if Gajim is running"
+msgstr ""
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Laat roostervenster zien of verbergt het"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4393,29 +8423,31 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:335
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
+#, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Gebruik: %s %s %s \n"
-"\t"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4424,148 +8456,203 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:420
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
+msgid ""
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
+"Argument \"%s\" is niet gespecificeerd. \n"
+"Type \"%s help %s\" voor meer info"
+
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Wachtwoord"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Thema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Je kunt je huidige thema niet verwijderen"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "thema naam"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Je kunt je huidige thema niet verwijderen"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chat"
-msgstr "Start Gesprek"
-
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chats"
-msgstr "Start Gesprek"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:152
 #, fuzzy, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+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:144
-msgid "Group Chat"
-msgstr "Groupsgesprek"
+#: ../src/groupchat_control.py:451
+#, fuzzy
+msgid "Insert Nickname"
+msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:144
+#: ../src/groupchat_control.py:603
 #, fuzzy
-msgid "Group Chats"
-msgstr "Groupsgesprek"
+msgid "Conversation with "
+msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:605
 #, fuzzy
-msgid "Insert Nickname"
-msgstr "Verander Bij_naam"
+msgid "Continued conversation"
+msgstr "Verbinding"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Je nieuwe account is met succes aangemaakt"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, 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:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Aansluiting: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s is nu bekend als %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, 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:936
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s is nu %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s blijkt geen geldige JID te zijn"
-
-#: ../src/groupchat_control.py:1227
-#, fuzzy, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Onbekend commando: /%s (als je deze tekst wil sturen, begin dan met /say)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Commando's: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4578,20 +8665,16 @@ msgstr ""
 "\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal hij eruit "
 "geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1259
-#, python-format
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Gebruik: /%s, leegt het tekst venster."
-
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4600,12 +8683,7 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_control.py:1268
-#, fuzzy, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Gebruik: /%s, leegt het tekst venster."
-
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4614,7 +8692,7 @@ msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4623,7 +8701,7 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4634,126 +8712,106 @@ msgstr ""
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1692
 #, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
-"gebruiken. (bijv. /%s loopt...)"
-
-#: ../src/groupchat_control.py:1288
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Gebruik: /%s <bericht>, stuurt een bericht zonder naar commando's te zoeken."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "Geen hulp beschikbaar voor /%s"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, 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:1358
+#: ../src/groupchat_control.py:1839
 #, 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:1362 ../src/roster_window.py:3962
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "Vraag mij dit niet nogmaals"
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "Bladwijzer bestaat al"
-
-#: ../src/groupchat_control.py:1433
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Ruimte \"%s\" heeft al een bladwijzer."
+msgid "Destroying %s"
+msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "Bladwijzer is met succes toegevoegd"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-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/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Een programmeerfout is ontdekt"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4761,86 +8819,100 @@ msgstr ""
 "Het is waarschijnlijk niet fataal, maar het is een goed idee toch de "
 "ontwikkelaars op de hoogte te stellen."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Rapporteer Fout"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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"
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+msgid "Gajim is not the default Jabber client"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:734
+#, fuzzy
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Wil je het overschrijven?"
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:738
+#: ../src/gtkgui_helpers.py:844
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logboek database wordt aangemaakt"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 #, fuzzy
 msgid "Contacts"
 msgstr "_Inhoud"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum:"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam:"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "_Bericht"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 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 "
@@ -4849,143 +8921,181 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s is nu %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+msgid "Timeout loading image"
+msgstr ""
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "Afbeelding is te groot"
+
+#: ../src/message_window.py:446
+#, fuzzy
+msgid "Chats"
+msgstr "Gesprek"
+
+#: ../src/message_window.py:448
+#, fuzzy
+msgid "Group Chats"
+msgstr "Groupsgesprek"
+
+#: ../src/message_window.py:450
+#, fuzzy
+msgid "Private Chats"
+msgstr "Start Gesprek"
+
+#: ../src/message_window.py:456
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
 
-#: ../src/message_window.py:274
-#, fuzzy, python-format
-msgid "%s - Gajim"
-msgstr "Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nieuw Enkel Bericht"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Algemeen"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr ""
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Bestandspad"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Die ruimte bestaat niet."
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 #, fuzzy
 msgid "Information received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie te publiceren zonder verbinding."
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr ""
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4993,226 +9103,159 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr ""
-"Het is niet mogelijk je contact informatie op te halen zonder verbinding."
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-#, fuzzy
-msgid "Observers"
-msgstr "Server"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Machtiging is verzonden"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "via account %s"
+msgid "Now \"%s\" will know your status."
+msgstr "\"%s\" zal nu je status ontvangen."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Abonneringsverzoek is verzonden"
+
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "to %s account"
-msgstr "aan %s account"
+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."
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Machtiging is verwijdert"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "using %s account"
-msgstr "via %s account"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#. profile, avatar
-#: ../src/roster_window.py:983
-#, fuzzy, python-format
-msgid "of account %s"
-msgstr "voor account %s"
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1003
-#, fuzzy
-msgid "_Manage Bookmarks..."
-msgstr "Beheer Bladwijzers..."
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "voor account %s"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#. History manager
-#: ../src/roster_window.py:1053
-#, fuzzy
-msgid "History Manager"
-msgstr "_Geschiedenis"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Door je status naar onzichtbaar te veranderen zal de verbinding met "
+"groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
+"wilt gaan?"
 
-#: ../src/roster_window.py:1062
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "Neem deel aan Groepsgesprek"
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
+"ingeschakeld is."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:1393
+#: ../src/roster_window.py:2534
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, 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:1421
+#: ../src/roster_window.py:2676
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, 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:1476
+#: ../src/roster_window.py:2733
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:1478
+#: ../src/roster_window.py:2735
 #, fuzzy
-msgid "Remove also all contacts in this group from your roster"
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-#, fuzzy
-msgid "_New group chat"
-msgstr "Groupsgesprek"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-#, fuzzy
-msgid "Send Group M_essage"
-msgstr "Ver_stuur Server Bericht"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "Her_noem"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr ""
-
-#: ../src/roster_window.py:2061
-#, fuzzy
-msgid "To all online users"
-msgstr "_Online Gebruikers"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "_Log in"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "Log _uit"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "_Wijzig Statusbericht"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "Machtiging is verzonden"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "\"%s\" zal nu je status ontvangen."
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "Abonneringsverzoek is verzonden"
-
-#: ../src/roster_window.py:2394
-#, 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:2406
-msgid "Authorization has been removed"
-msgstr "Machtiging is verwijdert"
-
-#: ../src/roster_window.py:2407
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "\"%s\" zal je nu altijd als offline zien."
-
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3132
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -5221,7 +9264,13 @@ 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:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5229,17 +9278,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:2627
+#: ../src/roster_window.py:3144
 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:2631
+#: ../src/roster_window.py:3148
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5248,83 +9297,27 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Je zult verbonden worden met %s zonder OpenPGP."
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "Wachtwoord Vereist"
-
-#: ../src/roster_window.py:2711
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Sla wachtwoord op"
-
-#: ../src/roster_window.py:2724
-#, fuzzy
-msgid "Wrong Passphrase"
-msgstr "Wachtwoord"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-msgid "You are participating in one or more group chats"
-msgstr "Je neem deel aan een of meerdere groepsgesprekken"
-
-#: ../src/roster_window.py:2783 ../src/roster_window.py:2843
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-msgstr ""
-"Door je status naar onzichtbaar te veranderen zal de verbinding met "
-"groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
-"wilt gaan?"
-
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 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:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr ""
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
-"ingeschakeld is."
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3956
+#: ../src/roster_window.py:3784
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -5332,118 +9325,334 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3958
+#: ../src/roster_window.py:3786
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"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:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Ongeldig Bestand"
+
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
-msgid "Drop %s in group %s"
-msgstr "Van %s in ruimte %s"
+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:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "via account %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "aan %s account"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "via %s account"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+#, fuzzy
+msgid "_Manage Bookmarks..."
+msgstr "Beheer Bladwijzers..."
 
-#: ../src/roster_window.py:4132
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, fuzzy, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Stuurt een bestand aan contact"
+msgid "of account %s"
+msgstr "voor account %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "voor account %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Wijzig Statusbericht"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publiceren"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Actief"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "Ontdek Services..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Ver_stuur Server Bericht"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:5055
+#, fuzzy
+msgid "To all online users"
+msgstr "_Online Gebruikers"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "_Inhoud"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "Ver_stuur Enkel Bericht"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transporten"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Transporten"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contact is Ingelogd"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Groupsgesprek"
 
-#: ../src/roster_window.py:4319
+#. History manager
+#: ../src/roster_window.py:5988
+#, fuzzy
+msgid "History Manager"
+msgstr "_Geschiedenis"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "Neem deel aan Groepsgesprek"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Onderwerp: %s\n"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Doorbladeren van %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Verbinding"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Contact is Ingelogd"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Ruimte:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Actief"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Type:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5451,25 +9660,25 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:311
 #, fuzzy
-msgid "Affiliation:"
-msgstr "Aansluiting: "
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Toepassingen</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5477,7 +9686,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5485,1290 +9694,401 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 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:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " bron met prioriteit"
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "logboek database wordt aangemaakt"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "%s is een bestand, maar een map werd verwacht"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim sluit nu af"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "%s is een map, maar een bestand werd verwacht"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "map %s wordt aangemaakt"
-
-#: ../src/common/config.py:55
-#, fuzzy
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "Afwezig vanwege inactiviteit"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr ""
-"Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "Niet beschikbaar vanwege inactiviteit"
-
-#: ../src/common/config.py:82
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr ""
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr ""
-
-#: ../src/common/config.py:96
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
-"dat * * verwijdert wordt."
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Voeg * en [n] toe aan roster titel?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
-"venster heropend wordt."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
-"(Standaard gedrag van Mirabilis ICQ)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
-"'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
-
-#: ../src/common/config.py:154
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " bron met prioriteit"
 
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP Versleuteling"
 
-#: ../src/common/config.py:160
 #, fuzzy
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
-
-#: ../src/common/config.py:161
-#, fuzzy
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
-"van een NAT of port forwarding."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr ""
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Laat tabs zien bij slechts één gesprek?"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "%s heeft geen OpenPGP sleutel uitgezonden en je hebt er geen toegewezen"
 
-#: ../src/common/config.py:175
 #, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Laat tab rand zien bij slechts één gesprek?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Laat sluit knop zien in tabs?"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Onbekend commando: /%s (als je deze tekst wil sturen, begin dan met /say)"
 
-#: ../src/common/config.py:189
 #, fuzzy
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Een puntkomma-onderbroken lijst van woorden die oplichten in een "
-"groepsgesprek"
-
-#: ../src/common/config.py:190
-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 ""
-"Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
-"alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
+#~ "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
+#~ msgid "Encryption enabled"
+#~ msgstr "Versleuteling ingeschakeld"
 
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
-"berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
+#~ msgid "Encryption disabled"
+#~ msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/common/config.py:193
 #, fuzzy
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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 ""
-"Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
-"geen bekend is, of de laatste afbeelding te oud is."
+#~ msgid "_Retype Password:"
+#~ msgstr "_Wachtwoord:"
 
-#: ../src/common/config.py:196
-#, fuzzy
-msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or his or her status message."
-msgstr ""
-"Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
-"wanneer een contact zijn/haar status aanpassen."
+#~ msgid "_Use proxy"
+#~ msgstr "_Gebruik proxy"
 
-#: ../src/common/config.py:197
-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 ""
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Indien aangevinkt en je twee of meer accounts hebt, zal Gajim de "
+#~ "contacten van alle accounts samenvoegen alsof ze een grote account zijn."
 
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr ""
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klik om de gespreksgeschiedenis van deze contact te bekijken"
 
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr ""
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Compacte Weergave    Alt+C"
 
-#: ../src/common/config.py:202
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klik om de gespreksgeschiedenis van deze ruimte te bekijken"
 
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr ""
+#~ msgid "Build custom query"
+#~ msgstr "Bouw aangepaste query"
 
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr ""
-
-#: ../src/common/config.py:205
-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:207
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
+#~ msgid "Query Builder..."
+#~ msgstr "Query Bouwer..."
 
-#: ../src/common/config.py:211
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr ""
+#~ msgid "Accept"
+#~ msgstr "Accepteer"
 
-#: ../src/common/config.py:212
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr ""
+#~ msgid "Invitation Received"
+#~ msgstr "Uitnodiging Ontvangen"
 
-#: ../src/common/config.py:213
-#, fuzzy
-msgid "Hides the buttons in group chat window."
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/common/config.py:214
-#, fuzzy
-msgid "Hides the buttons in two persons chat window."
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Interface Aanpassingen</b>"
 
-#: ../src/common/config.py:215
 #, fuzzy
-msgid "Hides the banner in a group chat window"
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+#~ msgid "A_fter nickname:"
+#~ msgstr "Na bijnaam:"
 
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr ""
+#~ msgid "Also known as iChat style"
+#~ msgstr "Ook bekend als iChat-stijl"
 
-#: ../src/common/config.py:217
 #, 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:218
-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:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr ""
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-
-#: ../src/common/config.py:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr ""
+#~ msgid "B_efore nickname:"
+#~ msgstr "Voor bijnaam:"
 
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
+#~ msgid "Chat"
+#~ msgstr "Gesprek"
 
-#: ../src/common/config.py:326
 #, fuzzy
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "OpenPGP is niet bruikbaar op deze computer"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-msgid "Language for which we want to check misspelled words"
-msgstr ""
-
-#: ../src/common/config.py:336
-msgid "all or space separated status"
-msgstr ""
-
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr ""
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Elke 5 _minuten"
 
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr ""
-
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "Slapen"
+#~ msgid "Events"
+#~ msgstr "Gebeurtenissen"
 
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "Zo terug"
-
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "In een paar minuten terug."
-
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "Eten"
-
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "Ik ben aan het eten, laat een bericht achter."
-
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "Film"
-
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "Ik been een film aan het kijken."
-
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "Werken"
-
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "Ik ben aan het werk."
-
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "Telefoon"
-
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "Ik ben aan het telefoneren."
-
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "Uit"
-
-#: ../src/common/config.py:357
 #, fuzzy
-msgid "I'm out enjoying life."
-msgstr "Ik ben uit van het leven genieten"
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr ""
+#~ "Gajim zal automatisch nieuwe berichten in een nieuw venster of tab in een "
+#~ "bestaand venster laten zien"
 
-#: ../src/common/config.py:361
 #, fuzzy
-msgid "I'm available."
-msgstr "Aanwezig"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
 
-#: ../src/common/config.py:362
-#, fuzzy
-msgid "I'm free for chat."
-msgstr "Open voor Gesprek"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
+#~ "rechtsonder in beeld"
 
-#: ../src/common/config.py:364
 #, fuzzy
-msgid "I'm not available."
-msgstr "Niet Beschikbaar"
-
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr ""
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim zal alleen het contacticoon veranderen bij nieuwe berichten"
 
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr ""
+#~ 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 ""
+#~ "Indien aangevinkt zal Gajim de positie en grootte van vensters onthouden "
+#~ "voor de volgende keer dat ze geopend worden"
 
-#: ../src/common/config.py:376
 #, fuzzy
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
-msgstr ""
-"Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
-"woorden in much_highlight_words bevat."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../src/common/config.py:377
-msgid "Sound to play when any MUC message arrives."
-msgstr ""
+#~ msgid "Print time:"
+#~ msgstr "Print tijd:"
 
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "groen"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Sla _positie en grootte op voor rooster- en gespreksvensters"
 
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr "kruidenier"
+#~ msgid "Show only in _roster"
+#~ msgstr "Alleen in _rooster weergeven"
 
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "menselijk"
+#~ msgid "The auto away status message"
+#~ msgstr "Het statusbericht voor automatische afwezigheid"
 
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "marine"
+#~ msgid "The auto not available status message"
+#~ msgstr "Het statusbericht voor automatisch niet beschikbaar"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Niet in staat de ruimte binnen te gaan"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Icoon in mededelingsgebied"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
 #, fuzzy
-msgid "Wrong host"
-msgstr "Wachtwoord"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:590
-#, 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:1523
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Bijnaam niet gevonden: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
-#, fuzzy
-msgid "Unable to join group chat"
-msgstr "Niet in staat de ruimte binnen te gaan"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Als een nieuwe gebeurtenis (bericht, bestandsoverdracht, enz.) ontvangen "
+#~ "is, kunnen de volgende methoden gebruikt worden om je te informeren. LET "
+#~ "OP: Nieuwe bericht-gebeurtenissen treden alleen op als het een nieuw "
+#~ "bericht is van een contact waar je nog geen gesprek mee hebt"
 
-#: ../src/common/connection_handlers.py:1586
 #, fuzzy
-msgid "A password is required to join this group chat."
-msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../src/common/connection_handlers.py:1589
 #, fuzzy
-msgid "You are banned from this group chat."
-msgstr "Je bent uit deze ruimte verbannen."
+#~ msgid "_After time:"
+#~ msgstr "Na tijdsstempel:"
 
-#: ../src/common/connection_handlers.py:1592
 #, fuzzy
-msgid "Such group chat does not exist."
-msgstr "Die ruimte bestaat niet."
+#~ msgid "_Before time:"
+#~ msgstr "Voor tijdsstempel:"
 
-#: ../src/common/connection_handlers.py:1595
 #, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "Ruimte creatie is beperkt."
-
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+#~ msgid "_Font:"
+#~ msgstr "Lettertype:"
 
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "Je staat niet in de ledenlijst"
+#~ msgid "_Never"
+#~ msgstr "_Nooit"
 
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
-"gebruiker.\n"
-"Geef een andere bijnaam op:"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Stel mij ervan op de hoogte"
 
-#: ../src/common/connection_handlers.py:1659
-msgid "I would like to add you to my roster."
-msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+#~ msgid "_Player:"
+#~ msgstr "_Speler:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we zijn nu op %s geabonneert"
+#~ msgid "_Pop it up"
+#~ msgstr "_Opduiken"
 
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "afmelding verzocht van %s"
+#~ msgid "Address"
+#~ msgstr "Adres"
 
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we zijn nu van %s afgemeld"
+#~ msgid "City:"
+#~ msgstr "Stad:"
 
-#: ../src/common/connection_handlers.py:1854
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan jouw "
-"rooster. Gebruik een roostermanagement applicatie zoals http://jru."
-"jabberstudio.org/ om het te verwijderen"
+#~ msgid "Company:"
+#~ msgstr "Bedrijf:"
 
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Verbinding met account \"%s\" verbroken"
+#~ msgid "Country:"
+#~ msgstr "Land:"
 
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr ""
+#~ msgid "Given:"
+#~ msgstr "Voornaam:"
 
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
+#~ msgid "Middle:"
+#~ msgstr "Middelste naam:"
 
-#. wrong answer
-#: ../src/common/connection.py:213
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Ongeldig wachtwoord"
+#~ msgid "Position:"
+#~ msgstr "Positie:"
 
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Kon geen verbinding maken met \"%s\""
+#~ msgid "Prefix:"
+#~ msgstr "Voorvoegsel:"
 
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Verbonden met server %s:%s met %s"
+#~ msgid "Role:"
+#~ msgstr "Rol:"
 
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Controleer je verbinding of probeer later nogmaals"
+#~ msgid "State:"
+#~ msgstr "Staat:"
 
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Inloggen mislukt met \"%s\""
+#~ msgid "Suffix:"
+#~ msgstr "Achtervoegsel:"
 
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Controleer gebruikersnaam en wachtwoord."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP wachtwoord niet opgegeven"
+#~ msgid "_Retrieve"
+#~ msgstr "_Haal op"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "onzichtbaar"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Verwijder van Rooster"
 
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "offline"
+#~ msgid "A_ccounts"
+#~ msgstr "A_ccounts"
 
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "Ik ben %s"
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
 
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-#, fuzzy
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Dit bericht is versleuteld]"
+#~ msgid "Ask:"
+#~ msgstr "Vraag:"
 
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Onderwerp: %s\n"
-"%s"
+#~ msgid "Client:"
+#~ msgstr "Client:"
 
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr ""
+#~ msgid "OS:"
+#~ msgstr "Besturingssysteem:"
 
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python koppeling ontbreekt op deze computer"
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
 
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Als dit niet de taal is waarvoor je spelfouten wilt aanmerken, stel dan "
+#~ "$LANG opnieuw in op jouw taal. Bijv. voor frans doe je export LANG=fr_FR "
+#~ "of export LANG=fr_FR.UTF-8 in ~/.bash_profile of in /etc/profile als je "
+#~ "het systeem globaal op frans wilt instellen.\n"
+#~ "\n"
+#~ "De markering van spelfouten zal niet worden gebruikt."
 
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
+#~ msgid "Every %s _minutes"
+#~ msgstr "Elke %s _minuten"
 
-#: ../src/common/exceptions.py:30
-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"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/common/exceptions.py:38
-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"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Je zult hem altijd als offline zien."
 
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s is nu %s (%s)"
 
-#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "one"
-msgstr "Geen"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr ""
+#~ msgid "Network Manager support not available"
+#~ msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "three"
-msgstr "Straat:"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
 
-#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "four"
-msgstr "Poort: "
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Gebruik: %s %s %s \n"
+#~ "\t"
 
-#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "five"
-msgstr "bestand"
+#~ msgid "Private Chat"
+#~ msgstr "Start Gesprek"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr ""
+#~ msgid "Group Chat"
+#~ msgstr "Groupsgesprek"
 
-#: ../src/common/fuzzyclock.py:43
-#, fuzzy
-msgid "seven"
-msgstr "Gebeurtenis"
+#~ msgid "%s is now %s"
+#~ msgstr "%s is nu %s"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr ""
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s blijkt geen geldige JID te zijn"
 
-#: ../src/common/fuzzyclock.py:43
 #, fuzzy
-msgid "nine"
-msgstr "_Verder"
+#~ msgid "%s - Gajim"
+#~ msgstr "Gajim"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr ""
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr ""
+#~ "Het is niet mogelijk je contact informatie op te halen zonder verbinding."
 
-#: ../src/common/fuzzyclock.py:43
 #, fuzzy
-msgid "eleven"
-msgstr "Wis MOTD"
+#~ msgid "_New group chat"
+#~ msgstr "Groupsgesprek"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr ""
+#~ msgid "_Log on"
+#~ msgstr "_Log in"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr ""
+#~ msgid "Log _off"
+#~ msgstr "Log _uit"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr ""
+#~ msgid "Save passphrase"
+#~ msgstr "Sla wachtwoord op"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "ten to %1"
-msgstr "Registreer met %s"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr ""
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Van %s in ruimte %s"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:62
 #, fuzzy
-msgid "Morning"
-msgstr "Werken"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Stuurt een bestand aan contact"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:63
 #, fuzzy
-msgid "Noon"
-msgstr "Geen"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr ""
+#~ msgid "Affiliation:"
+#~ msgstr "Aansluiting: "
 
-#: ../src/common/fuzzyclock.py:63
 #, fuzzy
-msgid "Evening"
-msgstr "Gebeurtenis"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr ""
-
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Ongeldig character in gebruikersnaam."
-
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Server adres vereist."
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Ongeldig character in hostnaam."
-
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Ongeldig character in bron."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Bezig"
-
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Bezig"
-
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_Niet Beschikbaar"
-
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "Open voor _Gesprek"
-
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Open voor Gesprek"
-
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Aanwezig"
-
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Aanwezig"
-
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Bezig met verbinden"
-
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "Af_wezig"
-
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Offline"
-
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Offline"
-
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "Onz_ichtbaar"
-
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "?contact has status:Onbekend"
-
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "?contact has status:Heeft fouten"
-
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "?Subscription we already have:Geen"
-
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Aan"
-
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Beide"
-
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "?Ask (for Subscription):Geen"
-
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Abonneren"
-
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "?Group Chat Contact Role:Geen"
-
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Beheerders"
-
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Beheerder"
-
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Deelnemers"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr ""
+#~ "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Deelnemer"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Verbonden met server %s:%s met %s"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Bezoekers"
+#~ msgid "invisible"
+#~ msgstr "onzichtbaar"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Bezoeker"
+#~ msgid "offline"
+#~ msgstr "offline"
 
-#: ../src/common/helpers.py:301
-#, fuzzy
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Group Chat Contact Role:Geen"
+#~ msgid "I'm %s"
+#~ msgstr "Ik ben %s"
 
-#: ../src/common/helpers.py:303
 #, fuzzy
-msgid "Owner"
-msgstr "_Eigenaar"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "Gajim - één los ongelezen bericht"
+#~ msgstr[1] "Gajim - %d ongelezen losse berichten"
 
-#: ../src/common/helpers.py:305
 #, fuzzy
-msgid "Administrator"
-msgstr "_Administrator"
-
-#: ../src/common/helpers.py:307
-#, fuzzy
-msgid "Member"
-msgstr "_Lid"
-
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "let op deze conversatie"
-
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "is met iets anders bezig"
-
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "is een bericht aan het typen..."
-
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "pauzeert tijdens het typen van een bericht"
-
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "heeft het gespreksvenster of -tab gesloten"
-
-#: ../src/common/helpers.py:881
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - één ongelezen bericht"
-msgstr[1] "Gajim - %d ongelezen berichten"
-
-#: ../src/common/helpers.py:887
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - één los ongelezen bericht"
-msgstr[1] "Gajim - %d ongelezen losse berichten"
-
-#: ../src/common/helpers.py:893
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - één ongelezen groepgesprek bericht"
-msgstr[1] "Gajim - %d ongelezen groepgesprek berichten"
-
-#: ../src/common/helpers.py:899
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - één ongelezen privé bericht"
-msgstr[1] "Gajim - %d ongelezen privé berichten"
-
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fout: kan %s niet voor lezen openen"
-
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr ""
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "Gajim - één ongelezen groepgesprek bericht"
+#~ msgstr[1] "Gajim - %d ongelezen groepgesprek berichten"
 
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr "cyaan"
-
-#: ../src/common/optparser.py:302
 #, fuzzy
-msgid "migrating logs database to indeces"
-msgstr "logboek database wordt aangemaakt"
-
-#: ../src/common/passwords.py:86
-#, fuzzy, python-format
-msgid "Gajim account %s"
-msgstr "voor account %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "Gajim - één ongelezen privé bericht"
+#~ msgstr[1] "Gajim - %d ongelezen privé berichten"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
 #, fuzzy
-msgid "Connection to host could not be established"
-msgstr "Kon geen verbinding maken met gebruiker."
-
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Om verdere berichten te versturen en ontvangen, moet je de verbinding "
-"opnieuw in stand brengen."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, fuzzy, python-format
-msgid "Unable to bind to port %d."
-msgstr "Niet in staat de ruimte binnen te gaan"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, fuzzy, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Kon geen verbinding maken met \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Dit bericht is versleuteld]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, fuzzy, python-format
-msgid "Error while adding service. %s"
-msgstr "fout tijdens versturen"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Kon geen verbinding maken met gebruiker."
 
 #, fuzzy
 #~ msgid "_New room"
@@ -6777,9 +10097,6 @@ msgstr "fout tijdens versturen"
 #~ msgid "Role: "
 #~ msgstr "Rol: "
 
-#~ msgid "Affiliation: "
-#~ msgstr "Aansluiting: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -6817,9 +10134,6 @@ msgstr "fout tijdens versturen"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ongeldige gebruikersnaam"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Onbekende D-Bus versie: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard publicatie is met succes afgerond"
 
@@ -6829,9 +10143,6 @@ msgstr "fout tijdens versturen"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Logboeken worden omgezet..."
 
-#~ msgid "_Join New Room"
-#~ msgstr "Nieuwe Ruimte _Binnengaan"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - één ongelezen bericht"
@@ -6847,18 +10158,9 @@ msgstr "fout tijdens versturen"
 #~ msgid "Send File"
 #~ msgstr "Bestand Verzenden"
 
-#~ msgid "Underline"
-#~ msgstr "Onderstreept"
-
-#~ msgid "Would you like to overwrite it?"
-#~ msgstr "Wil je het overschrijven?"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Nieuwe Ruimte Binnengaan..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
-
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Kies een van de volgende opties:</b>"
@@ -6867,10 +10169,6 @@ msgstr "fout tijdens versturen"
 #~ msgstr "Wis het Bericht van de Dag"
 
 #, fuzzy
-#~ msgid "I want a notification popup:"
-#~ msgstr "Gesprekstoestands _mededelingen:"
-
-#, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s wil je een bestand sturen:"
 
@@ -6886,18 +10184,12 @@ msgstr "fout tijdens versturen"
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Console..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "Kies een Contactafbeelding"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Gebruik compacte weergave bij gespreksvensters"
 
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Gebruik compacte weergave bij groepsgespreksvensters"
 
-#~ msgid "plain"
-#~ msgstr "simpel"
-
 #~ msgid "Send"
 #~ msgstr "Verzend"
 
@@ -6911,11 +10203,6 @@ msgstr "fout tijdens versturen"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Logboeken zijn met succes omgezet naar de database."
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr ""
-#~ "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
-#~ "weergeven"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start Gesprek met account %s"
@@ -6932,15 +10219,9 @@ msgstr "fout tijdens versturen"
 #~ msgid "Sound"
 #~ msgstr "Geluid"
 
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
 #~ msgid "Image"
 #~ msgstr "Afbeelding"
 
-#~ msgid "From %s"
-#~ msgstr "Van %s"
-
 #~ msgid "To %s"
 #~ msgstr "Aan %s"
 
@@ -7018,9 +10299,6 @@ msgstr "fout tijdens versturen"
 #~ "http://trac.gajim.org/wiki/MigrateLogToDot9DB voor meer informatie. Gajim "
 #~ "zal nu stoppen..."
 
-#~ msgid "Image is too big"
-#~ msgstr "Afbeelding is te groot"
-
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
diff --git a/po/no.po b/po/no.po
index d60aba1ea..a023fab5d 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: 2007-01-16 20:08+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-22 16:02+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -29,44 +29,53 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Send Enkel _Melding..."
+#: ../data/glade/roster_window.glade.h:7
+#, fuzzy
+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
-msgid "_Discover Services..."
-msgstr "_Oppdag Tjenester..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppe Samtale"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Rediger Konto"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Rediger Konto..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne Gmail Innboks"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Personlig Info"
+
 #: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
+#, fuzzy
+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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -79,53 +88,80 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, fuzzy
+msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vennligst fyll in data for din nye konto</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Pass_ord:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Behandle..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Bruk egendefinert maskinnavn/port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -133,67 +169,64 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Din JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Maskin:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Maskinnavn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Repeter Passord:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Bruk proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Konto"
 
@@ -202,228 +235,373 @@ msgid "Account Modification"
 msgstr "Konto Endring"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Administrator Liste"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Auto-reconnect when connection is lost"
 msgstr "Koble til automatisk når kontakten mistes"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
-#: ../data/glade/account_modification_window.glade.h:9
-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."
-
 #: ../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 ""
+"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."
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:457
-#: ../src/notify.py:479
-#: ../src/notify.py:491
-#: ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346
-#: ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436
-#: ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154
-#: ../src/common/contacts.py:280
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Generelle"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
-#: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din egen, så filoverføringen har større mulighet for å fungere. "
-
 #: ../data/glade/account_modification_window.glade.h:19
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et tidsavbrudd som resulterer i frakobling"
-
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet bare for deg"
+#: ../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 ""
+"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/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen ved oppstart"
+#: ../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 ""
+"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
-#: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Dersom valgt vil endringer til global status (håndtert av kombomenyen nederst i kontaktvinduet) endre status på denne kontoen. "
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
+"bare for deg"
 
 #: ../data/glade/account_modification_window.glade.h:23
-msgid "Information about you, as stored in the server"
-msgstr "Informasjon om deg, slik som den er lagret på serveren"
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
+"ved oppstart"
 
 #: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Behandle..."
+#: ../data/glade/accounts_window.glade.h:28
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+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/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1617
-#: ../src/config.py:3414
+#: ../data/glade/accounts_window.glade.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:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1197
-#: ../src/config.py:1202
-#: ../src/config.py:1386
-#: ../src/config.py:1607
-#: ../src/config.py:1616
-#: ../src/config.py:1675
-#: ../src/config.py:1749
-#: ../src/config.py:3404
-#: ../src/config.py:3413
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra jabber serveren når to eller flere klienter er tilkoblet med samme konto. Klienten med den høyeste prioriteten vil få hendelsen"
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra "
+"jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
+"Klienten med den høyeste prioriteten vil få hendelsen"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Ressur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren (samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få hendelsene. (se under)"
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to "
+"eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren "
+"(samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs "
+"navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
+"hendelsene. (se under)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Vis _Frakoblede Kontakter"
+
+#: ../data/glade/account_modification_window.glade.h:44
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Bruk egendefinert maskinnavn/port"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings proxier"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Justér etter status"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel samtale klient (som iChat, Trillian eller Gaim) vil vises i kontaktlisten. Du trenger ikke være koblet til en jabber server for at det skal virke.\n"
-"Dette er bare tilgjengelig dersom python-avahi er installert og avahi-tjenesten kjører."
 
-#: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account"
-msgstr "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle kontakter som om du hadde en konto"
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Post:"
 
-#: ../data/glade/accounts_window.glade.h:5
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Slå på"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Fornavn:"
+
+#: ../data/glade/accounts_window.glade.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
+
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Etternavn:"
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Slå på link-lokale meldinger"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Gi _nytt navn"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Endre"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Fjern"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Bruk egendefinert port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -518,12 +696,14 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.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"
+msgstr ""
+"<b>MERK:</b> Du bør starte gajim på nytt for å aktivere noen instillinger"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -542,45 +722,45 @@ msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Lister over Utestengte"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 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:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Velg MFD (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Oppdater MFD (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Lister over Utestengte"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Send Server Melding"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Send Melding"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr "et vindu/fane åpent med den kontakten"
@@ -594,7 +774,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Betingelser</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
@@ -611,8 +791,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Borte"
 
@@ -629,7 +808,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -638,7 +817,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -679,8 +858,11 @@ msgid "When "
 msgstr "Når"
 
 #: ../data/glade/advanced_notifications_window.glade.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"
+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
 msgid "_Disable auto opening chat window"
@@ -741,41 +923,53 @@ msgid "when I'm in"
 msgstr "når jeg er i"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Romeo og Julie</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Entry:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Sist endret:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Gamle historier"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Enetale"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Du har mottatt en ny inntreden:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Kontakter"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Forvalgt Status Melding</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Forvalgt Status Melding</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Lyder</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Endre Passord"
@@ -805,10 +999,9 @@ msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Legg til Kontaktliste"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -828,39 +1021,70 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klikk for å se tidligere samtaler med denne kontakten"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontakter"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _Fil"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Endre Open_PGP Kryptering"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Endre Open_PGP Kryptering"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kompakt Utseende    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Legg til Kontaktliste"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historie"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "In_viter til"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observerere"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
@@ -873,6 +1097,24 @@ msgstr "Rom Instillinger"
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Beskrivelse</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Server Funksjonalitet"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
@@ -914,15 +1156,18 @@ 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
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil den først bli stoppet og så fjernet."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+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
 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:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -930,8 +1175,7 @@ msgstr "_Fortsett"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
@@ -979,7 +1223,7 @@ msgstr "Gajim Tema Valg"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inaktiv"
 
@@ -1020,58 +1264,72 @@ msgid "_Background:"
 msgstr "_Bakgrunn:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Endre _Kallenavn"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Endre _Tema"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klikk for å se tidligere samtaler i dette rommet"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Konfigurer _Rom"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Konfigurer _Rom"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Lag _Bokmerke til Rommet"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Lag _Bokmerke til Rommet"
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Behandle Bokmerker"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "M_odererer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Beboer Handling"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Beboer Handling"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Stemme"
 
@@ -1079,85 +1337,83 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Tittel"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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 ""
 "<big><b>Velkommen til Gajim Historiske Logg Behandler</b></big>\n"
 "\n"
 "Du kan velge logger fra venstre og/eller søke databasen under.\n"
 "\n"
 "<b>ADVARSEL:</b>\n"
-"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+"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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim Historske Logg Behandler"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Slett"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Eksport"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Historske Logg Behandler"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Lag din egen spørring"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Spørrings Bygger..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Søk"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Søk"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Godkjenn"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Nekt"
+#, fuzzy
+msgid "Search:"
+msgstr "Søk"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Invitasjon motatt"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Logg samtale historikk"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1149
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1166,14 +1422,12 @@ msgid "Join this room automatically when I connect"
 msgstr "Gå inn i dette rommet automatisk ved tilkobling"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Passord:"
 
@@ -1182,13 +1436,12 @@ msgid "Recently:"
 msgstr "Nylig:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1208,18 +1461,37 @@ msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Tittel:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Rom Instillinger"
+
+#: ../data/glade/manage_pep_services_window.glade.h:2
+#, fuzzy
+msgid "_Configure"
+msgstr "_Fortsett"
+
+#: ../data/glade/manage_pep_services_window.glade.h:3
+#, fuzzy
+msgid "gtk-delete"
+msgstr "Slett"
+
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
@@ -1229,47 +1501,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "HTTP Connect"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Navn:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Pass_ord:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Skriv:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Maskin:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klikk for å sette inn et uttrykksikon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Legger til kontakt til kontaktlisten"
 
 #: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Kryptering"
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Lag _Bokmerke til Rommet"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Handlinger"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Endre _Kallenavn"
 
-#. 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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "er fokusert på en annen samtale"
+
+#: ../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 "Klikk for å sette inn et uttrykksikon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Send"
 
@@ -1285,36 +1595,77 @@ msgstr "<b>Editering av Avanserte Instillinger</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Handlinger</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Egendefinert</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Rediger en regel</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Utseende på en linje</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Samtalestatus Fane Farger</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Valg</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Grensenitt valg</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Lyder</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Valg</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Liste over Uønskede</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Forvalgt Status Melding</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avansert"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1324,44 +1675,26 @@ msgstr ""
 "Bare komponering \n"
 "Deaktivert"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 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:18
-msgid "Also known as iChat style"
-msgstr "Også kjent som iChat stil"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr "Alltid sjekk etter om Gajim er _standard Jabber klient ved oppstart"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will use the default one set here"
-msgstr "Et eksempel: Dersom du har slått på status melding for borte, så vil Gajim ikke spør flere ganger etter melding når du endrer status til borte; den vil bruke standard meldingen du lager her"
+msgstr ""
+"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Auto _borte etter:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Auto _ikke tilgjengelig etter:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Autodetektér hver gang Gajim starter\n"
@@ -1370,314 +1703,421 @@ msgstr ""
 "Alltid bruk XFCE4 standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:29
-#: ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Samtale"
-
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Velg dette valget bare dersom noen som ikke er i kontaktlisten din spammer/irriterer deg. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle kontakter som ikke er i kontaktlisten"
-
-#: ../data/glade/preferences_window.glade.h:31
-msgid "Configure color and font of the interface"
-msgstr "Konfigurer farge og font for grensesnittet"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Standard Status Melding"
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Status melding:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Standard status _ikonsamling:"
+#, fuzzy
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Alltid sjekk etter om Gajim er _standard Jabber klient ved oppstart"
 
 #: ../data/glade/preferences_window.glade.h:34
+msgid "Configure color and font of the interface"
+msgstr "Konfigurer farge og font for grensesnittet"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Bestemt av sender\n"
-"Samtale melding\n"
-"Enkel melding"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Vis _ekstra e-post detaljer"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Viste Samtale status opp_lysninger:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "H_vert 5 minutt"
+msgid "Display _extra email details"
+msgstr "Vis _ekstra e-post detaljer"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Uttrykksikoner:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Hendelser"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:44
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å vise i samtale vinduer."
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:45
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å sende motparten."
+msgid "Display status _messages of contacts in roster"
+msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim will automatically show new events by popping up the relative window"
-msgstr "Gajim vil automatisk vise deg nye hendelser ved å sprette opp det relative vinduet"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
+"med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
+"vise i samtale vinduer."
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
+"med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
+"sende motparten."
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget inn"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget ut"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
+"om at en kontakt har akkurat logget ut"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim vil bare endre ikonet til kontakten som har sendt den nye hendelsen"
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Gjemmer knappene i gruppe samtale vindu."
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 
 #: ../data/glade/preferences_window.glade.h:52
-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"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet og i gruppesamtaler"
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
 #: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet i kontaktliste vinduet og i gruppesamtaler"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:55
-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 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på skjermen, samt størrelsen på de til neste gang du åpner de"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
+"i kontaktliste vinduet og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte eller statiske grafiske uttrykksikoner"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorér rikt innhold i innkommende meldinger"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:59
-msgid "Ma_nage..."
-msgstr "Be_handle..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/glade/preferences_window.glade.h:60
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Velg dette valget bare dersom noen som ikke er i kontaktlisten din spammer/"
+"irriterer deg. Bruk med varsomhet, fordi det blokkerer alle meldinger fra "
+"alle kontakter som ikke er i kontaktlisten"
+
+#: ../data/glade/preferences_window.glade.h:62
+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 ""
-"Aldri\n"
-"Alltid\n"
-"Per konto\n"
-"Per type"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Alarmer meg om kontakter som:"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
+"vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Alarmér om nye _Gmail e-post"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "På hver _melding"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
+"eller statiske grafiske uttrykksikoner"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "En melding _vindu:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Utgående Samtale status opp_lysninger:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "En melding _vindu:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "Spill av _lyder"
+msgid "Ma_nage..."
+msgstr "Be_handle..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Tilstedeværelse"
+#, fuzzy
+msgid "Notifications"
+msgstr "Konto Endring"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Utskrifts tid:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Alarmer meg om kontakter som:"
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Alarmer meg om kontakter som:"
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Sett status til å vise navnet på _musikk som spilles"
+msgid "Notify on new _GMail email"
+msgstr "Alarmér om nye _Gmail e-post"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Vis bare i _kontaktliste"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Personlig Info"
 
 #: ../data/glade/preferences_window.glade.h:75
-msgid "Sign _in"
-msgstr "Logger _inn"
+msgid "Play _sounds"
+msgstr "Spill av _lyder"
 
 #: ../data/glade/preferences_window.glade.h:76
-msgid "Sign _out"
-msgstr "Logger _ut"
-
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom valgt vil Gajim kun vise rå meldings tekst."
-
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Status"
-msgstr "Status"
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:79
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Preferences"
+msgstr "Tilstedeværelse"
 
 #: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Den automatiserte borte meldinen"
+msgid "Sign _in"
+msgstr "Logger _inn"
 
 #: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Den autmatiserte ikke tilgjengelig meldingen"
+msgid "Sign _out"
+msgstr "Logger _ut"
 
 #: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Behandle alle innkommende meldinger som:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
+"valgt vil Gajim kun vise rå meldings tekst."
 
 #: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
-msgstr "Bruk _transportenes ikoner"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:84
-msgid "Use system _default"
-msgstr "Bruk systemets _standardinstillinger"
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+msgid "Status"
+msgstr "Status"
 
 #: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Standard status _ikonsamling:"
 
 #: ../data/glade/preferences_window.glade.h:86
-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 events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil følgende metoder kunne bli brukt for å informere deg om det. Vennligst merk at ny melding hendelser vil bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale med."
+#, fuzzy
+msgid "Style"
+msgstr "Henger"
 
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Når en ny hendelse blir motatt"
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/glade/preferences_window.glade.h:88
-msgid "Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr "Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du besøke http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Avanserte Innstillinger for Hendelsesmeldinger..."
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:90
-msgid "_Browser:"
-msgstr "_Nettleser:"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Bruk _transportenes ikoner"
 
 #: ../data/glade/preferences_window.glade.h:91
-msgid "_File manager:"
-msgstr "_Fil behandler:"
+msgid "Use system _default"
+msgstr "Bruk systemets _standardinstillinger"
 
 #: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Font:"
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Når en ny hendelse blir motatt"
 
 #: ../data/glade/preferences_window.glade.h:93
-msgid "_Highlight misspelled words"
-msgstr "_Uthev feilstavede ord"
+#, fuzzy
+msgid "_Away after:"
+msgstr "Auto _borte etter:"
 
 #: ../data/glade/preferences_window.glade.h:94
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
+msgid "_Browser:"
+msgstr "_Nettleser:"
 
 #: ../data/glade/preferences_window.glade.h:95
-msgid "_Incoming message:"
-msgstr "_Innkommende melding:"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Viste Samtale status opp_lysninger:"
 
 #: ../data/glade/preferences_window.glade.h:96
-msgid "_Log status changes of contacts"
-msgstr "_Logg status endringer til kontakter"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Uttrykksikoner:"
 
 #: ../data/glade/preferences_window.glade.h:97
-msgid "_Mail client:"
-msgstr "_Post klient:"
+msgid "_File manager:"
+msgstr "_Fil behandler:"
 
 #: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Aldri"
+msgid "_Highlight misspelled words"
+msgstr "_Uthev feilstavede ord"
 
 #: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Gi meg beskjed om det"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:100
-msgid "_Open..."
-msgstr "_Åpne..."
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorér rikt innhold i innkommende meldinger"
 
 #: ../data/glade/preferences_window.glade.h:101
-msgid "_Outgoing message:"
-msgstr "_Utgående melding:"
+msgid "_Incoming message:"
+msgstr "_Innkommende melding:"
 
 #: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Spiller:"
+msgid "_Log status changes of contacts"
+msgstr "_Logg status endringer til kontakter"
 
 #: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Sprett opp"
+msgid "_Mail client:"
+msgstr "_Post klient:"
 
 #: ../data/glade/preferences_window.glade.h:104
-msgid "_Reset to Default Colors"
-msgstr "_Tilbakestill til Standard Farger"
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Auto _ikke tilgjengelig etter:"
 
 #: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Sorter kontakter etter status"
+msgid "_Open..."
+msgstr "_Åpne..."
 
 #: ../data/glade/preferences_window.glade.h:106
-msgid "_Status message:"
-msgstr "_Status melding:"
+msgid "_Outgoing message:"
+msgstr "_Utgående melding:"
 
 #: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_URL:"
+msgid "_Reset to Default Colors"
+msgstr "_Tilbakestill til Standard Farger"
 
 #: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Viste Samtale status opp_lysninger:"
+
+#: ../data/glade/preferences_window.glade.h:109
+msgid "_Status message:"
+msgstr "_Status melding:"
+
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Bli med i _Gruppe Samtale"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "ikke i kontaktliste"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutter"
 
@@ -1713,6 +2153,10 @@ msgstr "Alle"
 msgid "Allow"
 msgstr "Tillate"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Nekt"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "JabberID"
@@ -1721,8 +2165,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1863
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -1762,142 +2205,177 @@ msgstr "å sende meg status"
 msgid "to view my status"
 msgstr "å se min status"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Legg til regel</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Om"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Personlig Bilde:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adresse"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Fødselsdag:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Personlig Bilde:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Fødselsdag:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "By:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Lyder</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Bedrift:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Avdeling:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-Post:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Etternavn:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Egendefinert</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Fornavn:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Hjemmeside:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Legg til regel</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Egendefinert</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Kallenavn:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Mellomnavn:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefon Nummer:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Mer"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Betingelser</b>"
 
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Post Kode:"
+
+#. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Personlig Info"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Lyder</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefon Nummer:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Plassering:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Post Kode:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Instillinger</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Tittel:"
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Lyder</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:38
-#: ../src/vcard.py:273
-msgid "Role:"
-msgstr "Rolle:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Om"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Fylke:"
+msgid "Click to set your avatar"
+msgstr "Klikk for å sette ditt kontaktbilde"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Gate:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Suffix:"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Personlig Info"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Jobb"
 
@@ -1913,79 +2391,128 @@ msgstr "Fjern kontoe _bare fra Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Fjern"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "F_orespør å se hans/hennes status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Legg til Spesiell _Alarm"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Tilegn Open_PGP Nøkkel"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Rediger _Grupper"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_viter til"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Send _Melding"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Fjern"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Send egendefinert XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Send _Fil"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Forby han/henne å se min status"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028
-#: ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "_Fjern fra Kontaktliste"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Omdøpe Kontakt"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Gi Nytt Navn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Abonnement"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "ni"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Kontoer"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Legg til Kontakt..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Ny _Kontakt"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Server Funksjonalitet"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -1999,52 +2526,91 @@ msgstr "Ofte Stilte Spørsmål (online)"
 msgid "Help online"
 msgstr "Hjelp online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Vis _Kontaktliste"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Innhold"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoer"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Oppdag Tjenester"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1256
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Innhold"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Vis"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Vennligst vent, henter liste over kommandoer..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Søk"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Ny _Kontakt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Kontaktinformasjon"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Søk"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "G_å"
@@ -2053,10 +2619,6 @@ msgstr "G_å"
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registrer til:"
@@ -2118,8 +2680,12 @@ 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
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er tilkoblet"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+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
 msgid "Subscription Request"
@@ -2129,10 +2695,31 @@ msgstr "Abonnerings Forespørsel"
 msgid "_Deny"
 msgstr "_Nekt"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID til kontakten du ønsker å snakke med"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
@@ -2145,58 +2732,73 @@ msgstr "Vis _Kontaktliste"
 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:5
-msgid "Ask:"
-msgstr "Spør:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Handlinger</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Klient:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Egendefinert</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Ressurs:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Instillinger</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Beskrivelse</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Egendefinert</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Konfigurer _Rom"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Ressurs:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Abonnement:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Logg samtale historikk"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Velg Bilde"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2206,11 +2808,6 @@ msgstr "<b>Jabber Trafikk</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Slå på"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2229,15 +2826,29 @@ msgstr "_Melding"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Fornavn:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Legg til Spesiell _Alarm"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Etternavn:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Tilegn Open_PGP Nøkkel"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Rediger _Grupper"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Gi Nytt Navn"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Rediger Konto..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2247,530 +2858,3262 @@ msgstr "Lokal jid:"
 msgid "Personal"
 msgstr "Personlige"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
-"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/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Ressurs:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Rediger Konto"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Bruk egendefinert port:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Kontaktinformasjon"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:137
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ingen)"
 
-#. we talk about password
-#: ../src/advanced.py:240
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Gjemt"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Tysk"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:208
-#: ../src/dialogs.py:1517
-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 export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør du export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile eller i den globale /etc/profile.\n"
-"\n"
-"Utheving av feilstavede ord funksjonen vil ikke bli brukt."
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:270
-#: ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:271
-#: ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:852
-msgid "Chats"
-msgstr "Samtaler"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Kryptering påslått"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "ikke i kontaktliste"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
 
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" etter %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Kryptering avslått"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Bruk autentisering"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Bruk autentisering"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Kryptering påslått"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Kommandoer: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
+"tredje person. (f.eks. /%s explodes.)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Ingen hjelpe informasjon for /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Denne meldingen er kryptert]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Kryptering avslått"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1406
-#: ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:785
-#: ../src/gajim.py:786
-#: ../src/gajim.py:1130
-#: ../src/roster_window.py:332
-#: ../src/roster_window.py:410
-#: ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508
-#: ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890
-#: ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900
-#: ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73
-#: ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "ikke i kontaktliste"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Denne meldingen er kryptert]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Denne meldingen er kryptert]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1551
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli mistet."
+#: ../src/chat_control.py:2226
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
+"mistet."
+
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
 
-#: ../src/config.py:137
-#: ../src/config.py:588
-msgid "Disabled"
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "lager logg database"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, 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:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim vill nå lukkes"
+
+#: ../src/common/check_paths.py:136
+#, 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:152
+#, python-format
+msgid "creating %s directory"
+msgstr "lager %s mappe"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Endre statusinformasjon"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Endre status"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Sett fraværstype og beskrivelse"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Ledig for samtale"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Tilkoblet"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Utvidet borte"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Ikke forstyrr"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Frakoblet - ikke kontakt"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Tilstedeværelses beskrivelse:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Statusen har blitt endret."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Gå ut av Gruppesamtale"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s fra %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Du har ikke blitt med i en gruppesamtale."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Gruppesamtaler"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Du gikk ut av følgende gruppesamtaler:"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d ulest melding"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tid i minutter før status endres til borte."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Borte på grunn av inaktivitet"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tid i minutter før status endres til ikke tilgjengelig."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Ikke tilgjengelig på grunn av inaktivitet"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Standard"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Slå på link-lokal/zeroconf meldinger"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Språk som brukes av ordlisten"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - vis klokkeslett for hver melding.\n"
+"'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
+"'never' - aldri vis klokkeslett."
+
+#: ../src/common/config.py:121
+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 ""
+"Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til "
+"4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
+"den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Behandle * / _ par som mulige formaterings symboler."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
+"fjernet."
+
+#: ../src/common/config.py:128
+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 ""
+"Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ascii "
+"formatering dersom valgt. For syntax, se http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
+"installere docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
+"gruppesamtaler."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
+"opptatt av noen andre i samtalegruppen."
+
+#: ../src/common/config.py:161
+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 ""
+"Dette valget lar deg endre tidsformatet som skrives i samtaler. For eksempel "
+"\"[%H:%M] \" vil vise \"[hour:minute] \". Se python dokumentasjon på "
+"strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
+"time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Tegn som skrives før kallenavnet i samtaler"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Tegn som skrives etter kallenavnet i samtaler"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Legg * og [n] inn i kontaktliste tittelen?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
+"blir åpnet på nytt."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
+"Klient standard oppførsel)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
+"'WIKTIONARY' som betyr bruk wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
+
+#: ../src/common/config.py:180
+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 ""
+"Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status "
+"for kontoer (gitt at de ikke har listen_to_network_manager satt til False og "
+"at de synkroniserer med global status) basert på statusen til nettverks "
+"tilkoblingen."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
+"avslått."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
+"det hvert x minutt."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Spør før lukking av gruppesamtale fane/vindu."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
+"separerte listen av rom jider."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
+"separerte listen av rom jider."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
+"adresse oversetting/port videresending."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Varsle om hendelser i system-statusfelt ikonet."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Vis fane når du har bare en samtale?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Vis notatblokk faner i samtalevinduer?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Vis lukk knapp på fanen?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Samtale status opp_lysninger:"
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
+
+#: ../src/common/config.py:219
+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 ""
+"Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
+"på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
+"oppstart."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
+"meldinger. Avhengig av valgte tema kan dette ikonet være animert."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"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:229
+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 ""
+"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:230
+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 ""
+"kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim "
+"ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/"
+"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:232
+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:233
+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:235
+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:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Ikke vis kontaktbilde for transporten selv."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
+
+#: ../src/common/config.py:238
+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 ""
+"Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil "
+"vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
+"det er ventende hendelser."
+
+#: ../src/common/config.py:240
+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 liker ikke sha informasjon når man går inn i et passord beskyttet "
+"samtalerom. Sett dette valget til False for å slutte å sende sha informasjon "
+"til gruppesamtaler"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
+"'always' - Alle meldinger sendes til ett vindu.\n"
+"'never' - Alle meldinger får egne vindu.\n"
+"'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
+"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes "
+"til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
+"Gajim før det aktiveres"
+
+#: ../src/common/config.py:244
+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:245
+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:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Gjemmer knappene i gruppe samtale vindu."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Gjemmer tittel banneret i to personers samtale vindu"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
+
+#: ../src/common/config.py:250
+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 ""
+"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:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Send melding og lukk vinduet"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
+
+#: ../src/common/config.py:254
+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:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
+
+#: ../src/common/config.py:256
+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 ""
+"Dersom True vil du kunne sette en negativ prioritet til din konto i "
+"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:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
+"konto passord."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
+"og gruppe rader. "
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+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:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritet vil endre automatisk i følge med din status. Prioritetene "
+"defineres i autopriority_* valgene."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 omvei"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Dersom valgt vil Gajim bruke din IP og proxier definert i "
+"file_transfer_proxies valget for filoverføring."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "alle eller mellomroms separert status"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no', eller 'both'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' eller ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Sover"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Snart tilbake"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Tilbake om noen minutter."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Spiser"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Jeg spiser, så legg igjen en beskjed"
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Jeg ser på en film."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Jobber"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Jeg jobber."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Jeg sitter i telefonen."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Ute"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Jeg er ute og lever livet."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Jeg er tilgjengelig."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Ledig for prat."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Snart tilbake."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Jeg er ikke tilgjengelig."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Ikke forstyrr."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Hade bra!"
+
+#: ../src/common/config.py:441
+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 ""
+"Lyd som spilles når en samtalerom melding inneholder et av ordene i "
+"muc_highlight_words, eller når en samtalerom melding inneholder ditt "
+"kallenavn."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Lyd som spilles når en ny samtalerom melding mottas."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "grønn"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "varehandel"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "menneskelig"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marine"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Klarer ikke å uvirksom modulen"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Feil maskinnavn"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, 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:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Utvidelse ikke støttet"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Kallenavn ikke lovlig: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du er uønsket i dette samtalerommet."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Et slikt samtalerom finnes ikke."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "Gruppesamtale oppretting er begrenset."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Ditt registrerte kallenavn må bli brukt. "
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du er ikke medlems listen."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Godkjenning har blitt fjernet"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+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:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi abonnerer nå på %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "frakoblings ønske fra %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "vi abonnerer ikke lenger på %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
+"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
+"fjerne den"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passordsetning ble ikke gitt"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Klarer ikke å uvirksom modulen"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Tilkobling til konto \"%s\" har blitt mistet"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Automatisk tilkobling."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Ukjent D-Bus versjon: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Ugyldig svar"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Tilkobling Feilet"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunne ikke koble til \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Kunne ikke koble til \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Tilkobling til konto \"%s\" har blitt mistet"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Ukjent D-Bus versjon: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autentisering feilet med \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Feil ved fjerning av liste over uønskede"
+
+#: ../src/common/connection.py:801
+#, fuzzy, 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 ""
+"Listen over utestengte %s har ikke blitt fjernet. Den er kanskje aktiv i en "
+"av dine tilkoblede ressurser. Deaktiver den og prøv igjen."
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Tittel: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Ikke hentet på grunn av usynlig status"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observerere"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transporter"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "ikke i kontaktliste"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindinger mangler på denne maskinen"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Konto navn kan ikke være tomt."
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sesjons bussen er ikke tilgjengelig.\n"
+"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "en"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "to"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tre"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "fire"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "fem"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "seks"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "syv"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "åtte"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "ni"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "ti"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "elleve"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "tolv"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "klokken $0"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "fem over $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "ti over $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "kvart over $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "ti på halv $1"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "fem på halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "fem over halv $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "ti over halv $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "kvart på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "ti på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "fem på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Natt"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Tidlig morgen"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Morgen"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Nesten formiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Middag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Ettermiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Ettermiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Sen kveld"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Starten av uken"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Midten av uken"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Slutten av uken"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Helg!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Ugyldig karakter i brukernavn."
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Server adresse kreves."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Ugyldig karakter i domene navn."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Ugyldig karakter i ressurs."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Opptatt"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Opptatt"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Ikke Tilgjengelig"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Ledig for Samtale"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Ledig for Prat"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Tilgjengelig"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Tilgjengelig"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Kobler til"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "B_orte"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Frakoblet"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Usynlig"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Ukjent"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Har feilmeldinger"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Ingen"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Til"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Begge"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Ingen"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Abonnér"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Ordstyrere"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Ordstyrer"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Deltakere"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Deltaker"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Besøkende"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Besøk"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Ingen"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Eier"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Medlem"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "er fokusert på en annen samtale"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "gjør noe annet"
+
+#: ../src/common/helpers.py:405
+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:408
+msgid "paused composing a message"
+msgstr "tok pause i skriving av en melding"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "har lukket samtalevinduet eller fanen"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Send melding"
+msgstr[1] "Send melding"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "Fra %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "Fra %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "Fra %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "feil: kan ikke åpne %s for lesing"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "turkis"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "migrerer logg databaser til indekser"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim konto %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pauset"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Fet"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Har"
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Samtaler"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Fet"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Innhold"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Komplett"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Innhold"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deaktivert"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "uri"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Slett"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
 msgstr "Deaktivert"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Deaktivert"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Deaktivert"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Aktivert"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Gruppe"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Maskin:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "melding"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Aktivert"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Usynlig"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "en"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Maskin:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Tysk"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Endre"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Frakoblet"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Gruppe"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "elleve"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Henger"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Sist endret:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Kallenavn"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Sover"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Gate:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Abonnerte"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tid"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Strek Under"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Feil maskinnavn"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Ettermiddag"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Morgen"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "alle i gruppen"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Ettermiddag"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Utkasting %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Bli med"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "rom"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Endrer Tittel"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Utkasting %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "enkel"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Utkasting %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "Logger _ut"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Grunn"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Grunn"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Sover"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Jeg ser på en film."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Spiser"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Jeg sitter i telefonen."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Overfører"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Tilkoblet"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Åpne som _Link"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Jobber"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Jobber"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Hvert %s _minutt"
+msgid "Unable to bind to port %s."
+msgstr "Klarer ikke å lytte til port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli "
+"avbrutt."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
+"data."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke "
+"gyldig, så den ignoreres."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/config.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahi feil"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-lokal meldinger fungerer muligens ikke riktig."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Vennligst sjekk om Avahi er installert."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Kunne ikke starte lokal tjeneste"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Klarer ikke å lytte til port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunne ikke endre status til konto \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
+"sendes."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Denne meldingen er kryptert]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Feil ved tilføying av tjeneste. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:361
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:684
-#: ../src/gajim.py:2165
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Standard Status Melding"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Slå på"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Egendefinert</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:685
-#: ../src/gajim.py:2166
+#: ../src/config.py:651
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet språk ved å sette stavekontro_llspråk valget."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:1046
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Neste Melding Motatt"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/config.py:1261
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Navn"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Logge inn på nytt nå?"
+
+#: ../src/config.py:1406
+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:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Uleste hendelser"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har åpne samtaler på konto %s"
+
+#: ../src/config.py:1694
+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:1705
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1311
-#: ../src/config.py:1905
-msgid "Unread events"
-msgstr "Uleste hendelser"
-
-#: ../src/config.py:1312
+#: ../src/config.py:1710
 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:1316
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1317
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg et annet navn."
+#: ../src/config.py:1717
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
+"et annet navn."
 
-#: ../src/config.py:1321
-#: ../src/config.py:1325
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1322
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1326
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1334
-#: ../src/config.py:1340
-#: ../src/config.py:1350
-#: ../src/config.py:3013
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Behandle Kontoer"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Skriv inn nytt navn for gruppe %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1341
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1400
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1401
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1529
-#: ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Snart tilbake."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1539
-msgid "Relogin now?"
-msgstr "Logge inn på nytt nå?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:1540
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Velg din OpenPGP nøkkel"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1567
+#: ../src/config.py:2089
 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:1574
-#: ../src/dialogs.py:1131
-#: ../src/dialogs.py:1317
-#: ../src/disco.py:417
-#: ../src/profile_window.py:313
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1575
+#: ../src/config.py:2097
 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:1579
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:1580
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:1604
-#: ../src/config.py:3401
-msgid "Failed to get secret keys"
-msgstr "Klarte ikke å hente hemmelig nøkkel"
-
-#: ../src/config.py:1605
-#: ../src/config.py:3402
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
-
-#: ../src/config.py:1608
-#: ../src/config.py:3405
-msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Nøkkel Valg"
-
-#: ../src/config.py:1609
-#: ../src/config.py:3406
-msgid "Choose your OpenPGP key"
-msgstr "Velg din OpenPGP nøkkel"
-
-#. Name column
-#: ../src/config.py:1839
-#: ../src/disco.py:741
-#: ../src/disco.py:1467
-#: ../src/disco.py:1705
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Navn"
-
-#: ../src/config.py:1842
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1906
-msgid "Read all pending events before removing this account."
-msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
-
-#: ../src/config.py:1943
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Du har åpne samtaler på konto %s"
-
-#: ../src/config.py:1944
-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:2003
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2004
+#: ../src/config.py:2134
 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:2238
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2240
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2312
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2314
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2348
-#: ../src/disco.py:748
-#: ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2365
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2388
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2778,11 +6121,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2390
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2391
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2790,11 +6133,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2393
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2394
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2802,11 +6145,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2397
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2814,7 +6157,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2830,369 +6173,485 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2503
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2520
-#: ../src/roster_window.py:2733
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2521
-#: ../src/roster_window.py:2729
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2522
-#: ../src/roster_window.py:2734
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2536
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2537
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2622
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2624
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2692
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2725
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2726
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2792
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:2988
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2989
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2999
-#: ../src/dialogs.py:1336
-msgid "Invalid password"
-msgstr "Ugyldig passord"
-
-#: ../src/config.py:3000
-msgid "You must enter a password for the new account."
-msgstr "Du må skrive inn et passord for den nye kontoen"
-
-#: ../src/config.py:3004
-#: ../src/dialogs.py:1341
-msgid "Passwords do not match"
-msgstr "Passordene er ikke like"
-
-#: ../src/config.py:3005
-#: ../src/dialogs.py:1342
-msgid "The passwords typed in both fields must be identical."
-msgstr "Passordene du skriver inn i begge felt må være identiske."
-
-#: ../src/config.py:3024
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:3025
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:3042
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3043
-#: ../src/config.py:3078
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra hovedvinduet."
+#: ../src/config.py:3119 ../src/config.py:3308
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
+"eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
+"hovedvinduet."
 
-#: ../src/config.py:3077
-msgid "Your new account has been created successfully"
-msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kontakt allerede i kontaktlisten"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3153
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:271
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med i denne gruppe samtalen"
+#: ../src/conversation_textview.py:549
+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:340
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+msgstr ""
+"Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
+"i denne gruppe samtalen"
+
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:712
 #, 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:386
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:790
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM klient"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Velg MFD (MOTD)"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Status Melding"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
+"et annet navn."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
+msgstr ""
+"Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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."
+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:779
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:909
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Klarer ikke å lytte til port %s."
-
-#: ../src/dialogs.py:910
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli avbrutt."
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
+msgid ""
+"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 ""
+"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/dialogs.py:1061
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:1064
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1124
-#: ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1132
+#: ../src/dialogs.py:1686
 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:1147
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1215
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:1216
-#: ../src/dialogs.py:1222
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:1229
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:1268
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Kontoen \"%s\" er tilkoblet til serveren"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1271
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3201,522 +6660,845 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1296
-#: ../src/dialogs.py:1655
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1297
-#: ../src/dialogs.py:1656
-#: ../src/dialogs.py:1787
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1306
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:1318
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:1337
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Ugyldig passord"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Passordene er ikke like"
+
+#: ../src/dialogs.py:2025
+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:1384
-#: ../src/notify.py:211
-#: ../src/notify.py:415
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:1386
-#: ../src/notify.py:219
-#: ../src/notify.py:417
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:238
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:223
-#: ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1389
-#: ../src/notify.py:230
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:1389
-#: ../src/gajim.py:1225
-#: ../src/notify.py:428
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1391
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1393
-#: ../src/gajim.py:1197
-#: ../src/gajim.py:1354
-#: ../src/notify.py:424
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1395
-#: ../src/gajim.py:1417
-#: ../src/gajim.py:1439
-#: ../src/gajim.py:1456
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1396
-#: ../src/gajim.py:1420
-#: ../src/notify.py:426
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1398
-#: ../src/gajim.py:1094
-#: ../src/notify.py:430
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1400
-#: ../src/notify.py:203
-#: ../src/notify.py:432
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:1587
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1592
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1615
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, fuzzy, python-format
+msgid "Form %s"
+msgstr "Fra %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1688
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1732
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1857
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:1909
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Rekkefølge: %s, handling: %s, type: %s, verdi: %s"
 
-#: ../src/dialogs.py:1912
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %s, handling: %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:2041
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:2139
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:2210
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Du har ikke blitt med i en gruppesamtale."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "%Contact har invitert deg til gruppesamtalen %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2328
-#: ../src/dialogs.py:2373
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:2363
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:2508
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2514
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:2635
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Andre"
 
-#: ../src/disco.py:102
-#: ../src/disco.py:103
-#: ../src/disco.py:1253
-#: ../src/gajim.py:539
-#: ../src/roster_window.py:271
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:368
-#: ../src/roster_window.py:451
-#: ../src/roster_window.py:483
-#: ../src/roster_window.py:485
-#: ../src/roster_window.py:3896
-#: ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transporter"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:643
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk adressen og prøv igjen."
+#: ../src/disco.py:657
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
+"adressen og prøv igjen."
 
-#: ../src/disco.py:647
-#: ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %s med %s kontoen"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1143
-#: ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Kjør Kommando"
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "Ingen"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Historikk Behandler"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Melding Sendt"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP Kryptering"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Innkommende melding:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Generelle"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Server Funksjonalitet"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173
-#: ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivelse: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:705
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:707
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "En fil med dette navnet eksisterer og du har ikke rettigheter til å overskrive den."
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"En fil med dette navnet eksisterer og du har ikke rettigheter til å "
+"overskrive den."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:711
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:721
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:722
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3724,90 +7506,105 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:568
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:570
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, 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"
+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:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:199
+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:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den på %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den "
+"på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3815,429 +7612,709 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autentisering for %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Passordsetning Kreves"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Feil Passordsetning"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+"samtalebruker.\n"
+"Vennligst skriv et annet kallenavn under:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:393
-#: ../src/notify.py:434
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Godtar du denne forespørselen?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autentisering for %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:710
-#, python-format
-msgid "Subject: %s"
-msgstr "Tittel: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:755
-#: ../src/gajim.py:768
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %s ( %s )"
 
-#: ../src/gajim.py:801
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:802
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:810
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:811
-msgid "You will always see him or her as offline."
-msgstr "Du vil alltid se han eller henne som frakoblet."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:854
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:855
-#: ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s er nå kjent som %s"
 
-#: ../src/gajim.py:1004
-#: ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s er nå %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1007
-#: ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s er nå %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1104
-msgid "Your passphrase is incorrect"
-msgstr "Passord setningen din er ikke riktig"
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Et passord kreves for å bli med i dette samtalerommet."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
 
-#: ../src/gajim.py:1105
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1219
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Fra: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1444
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1457
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "På hver _melding"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:1575
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Brukernavn Konflikt"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Tilkobling"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Kryptering avslått"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gajim.py:2113
-msgid "Network Manager support not available"
-msgstr "Network Manager støtte er ikke tilgjengelig"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bokmerke allerede satt"
+
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/gajim.py:2188
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på en egen linje"
-
-#: ../src/gajim-remote.py:85
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:188
-#: ../src/gajim-remote.py:197
-#: ../src/gajim-remote.py:204
-#: ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:222
-#: ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:247
+#: ../src/gajim-remote.py:95
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
+"en egen linje"
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, usynlig"
+msgstr ""
+"en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+"usynlig"
 
-#: ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:100
-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 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status til alle kontoer som har \"synkroniser med global status\" valget påslått"
+#: ../src/gajim-remote.py:113
+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 ""
+"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
+"til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:115
-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 "Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+#: ../src/gajim-remote.py:128
+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 ""
+"Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
+msgstr ""
+"dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:128
-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 "Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+#: ../src/gajim-remote.py:141
+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 ""
+"Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID til kontakten som vil motta meldingen"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Returnerer innstillinger (globale innstillinger om ikke en konto er spesifisert)"
+msgstr ""
+"Returnerer innstillinger (globale innstillinger om ikke en konto er "
+"spesifisert)"
 
-#: ../src/gajim-remote.py:209
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Returnerer gjeldende status melding (den globale om ikke en konto er spesifisert)"
+#: ../src/gajim-remote.py:231
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Returnerer gjeldende status melding (den globale om ikke en konto er "
+"spesifisert)"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:229
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt til alle kontoer"
+#: ../src/gajim-remote.py:251
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Rom:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Kallenavn ikke funnet: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "passord"
 
 #: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Passordene er ikke like"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Vis eller skjul kontaktliste vinduet"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4246,29 +8323,31 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Bruk: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:358
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:362
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4277,948 +8356,1186 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:439
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:443
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argumentet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:461
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Feil uri"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Du kan ikke slette ditt gjeldene tema"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privat Samtale"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Private Samtaler"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Du er ikke lenger i samtalerommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppe Samtale"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppe Samtaler"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Samtale Historikk"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Tilkobling"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:1142
 #, 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:840
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1153
 #, 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:852
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Tilhørighet: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s er nå kjent som %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s har blitt utvist: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1063
-#: ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174
-#: ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117
-#: ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s ser ikke ut til å være en gyldig JID"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før teksten)"
-
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1656
 #, python-format
-msgid "Commands: %s"
-msgstr "Kommandoer: %s"
-
-#: ../src/groupchat_control.py:1253
-#, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
-
-#: ../src/groupchat_control.py:1260
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den spesifiserte brukeren."
-
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
-
-#: ../src/groupchat_control.py:1266
-#, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak dersom spesifisert."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
+"samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det "
+"inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil "
+"denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1269
+#: ../src/groupchat_control.py:1663
 #, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Bruk: /%s, gjemmer samtale knappene."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
+"spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1669
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser en grunn dersom spesifisert."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
+"dersom spesifisert."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1675
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og gir mulighet for å spesifisere valgfritt kallenavn."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
+"en grunn dersom spesifisert."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1679
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke mellomrom i kallenavn."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
+"gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1683
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk tredje person. (f.eks. /%s explodes.)"
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
+"kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
+"mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1692
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender meldingen til brukeren spesifisert av kallenavn."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
+"sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende samtalerom."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+"samtalerom."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
-
-#: ../src/groupchat_control.py:1305
-#, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre kommandoer."
+msgstr ""
+"Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
 
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1708
 #, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjelpe informasjon for /%s"
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
+"kommandoer."
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1837
 #, 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:1361
-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:1365
-#: ../src/roster_window.py:4036
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
+#: ../src/groupchat_control.py:1839
+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:1399
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1435
-msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
-
-#: ../src/groupchat_control.py:1436
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Beskrivelse: %s"
 
-#: ../src/groupchat_control.py:1445
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1446
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1575
-#: ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "En programmerings feil har blitt detektert"
 
-#: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene likevel."
+#: ../src/gtkexcepthook.py:47
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene "
+"likevel."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Rapporter Feil"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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:649
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:650
+#: ../src/gtkgui_helpers.py:734
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:651
+#: ../src/gtkgui_helpers.py:735
 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:750
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:751
+#: ../src/gtkgui_helpers.py:805
 #, 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:760
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/history_manager.py:186
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+#: ../src/history_manager.py:224
+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:188
+#: ../src/history_manager.py:226
 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 ""
-"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du JA, ellers klikker du NEI.\n"
+"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket "
+"som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du "
+"JA, ellers klikker du NEI.\n"
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s er nå %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Kunne ikke laste bilde"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "Bilde er for stort"
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Samtaler"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Gruppe Samtaler"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Private Samtaler"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Ny Melding fra %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Generelle"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:107
-#: ../src/profile_window.py:210
-#: ../src/profile_window.py:219
-msgid "Click to set your avatar"
-msgstr "Klikk for å sette ditt kontaktbilde"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Fil sti"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Et slikt samtalerom finnes ikke."
 
 #. keep identation
-#: ../src/profile_window.py:137
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:314
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:349
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Det skjedde en feil med publisering av din personlige informasjon, prøv igjen senere."
+#: ../src/profile_window.py:358
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det skjedde en feil med publisering av din personlige informasjon, prøv "
+"igjen senere."
 
-#: ../src/roster_window.py:171
-#: ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:344
-#: ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "Observerere"
-
-#: ../src/roster_window.py:692
-#: ../src/roster_window.py:3201
-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"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Godkjenning har blitt sendt"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "bruker kontoen %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Nå vil \"%s\" kunne se din status."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "til %s kontoen"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Abonnerings forespørsel er sendt"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "på %s kontoen"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Godkjenning har blitt fjernet"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "for konto %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Behandle Bokmerker..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomekeyring er installert men ikke startet riktig (systemvariabel er ikke "
+"satt riktig)"
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "for kontoen %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Historikk Behandler"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1068
-msgid "_Join New Group Chat"
-msgstr "_Bli med i Gruppesamtale"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1398
-#: ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
+"historikk påslått."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1403
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker denne transporten."
+#: ../src/roster_window.py:2526
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
+"denne transporten."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:1411
-#, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports:%s"
-msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse transportene:%s"
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
+"transportene:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, 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:1517
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Fjern og alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1782
-#: ../src/roster_window.py:2043
-msgid "_New group chat"
-msgstr "_Ny gruppe samtale"
+#: ../src/roster_window.py:3128
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1913
-msgid "I would like to add you to my roster"
-msgstr "Jeg ønsker å legge deg til min kontaktliste"
+#: ../src/roster_window.py:3132
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
+"eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:2088
-#: ../src/roster_window.py:2135
-msgid "Send Group M_essage"
-msgstr "Send Gruppe M_elding"
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/roster_window.py:2114
-msgid "Re_name"
-msgstr "Gi _nytt navn"
+#: ../src/roster_window.py:3141
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+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:2141
-msgid "To all users"
-msgstr "Til alle brukere"
+#: ../src/roster_window.py:3144
+msgid "I want this contact to know my status after removal"
+msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: ../src/roster_window.py:2144
-msgid "To all online users"
-msgstr "Til alle påloggede brukere"
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3148
+msgid "Contacts will be removed from your roster"
+msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:2180
-msgid "_Log on"
-msgstr "_Logg på"
+#: ../src/roster_window.py:3152
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Ved å fjerne disse kontaktene:%s\n"
+"fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
+"frakoblet."
 
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "Logg _av"
+#: ../src/roster_window.py:3191
+msgid "No account available"
+msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:2312
-#: ../src/roster_window.py:2383
-msgid "_Change Status Message"
-msgstr "_Endre Status Melding"
+#: ../src/roster_window.py:3192
+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:2455
-msgid "Authorization has been sent"
-msgstr "Godkjenning har blitt sendt"
+#: ../src/roster_window.py:3708
+msgid "Metacontacts storage not supported by your server"
+msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:3710
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Din server støtter ikke lagring av metakontakt informasjon. Så denne "
+"informasjonen vil ikke bli lagret på neste oppkobling."
+
+#: ../src/roster_window.py:3784
+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:3786
+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 ""
+"Metakontakter er en måte å omgruppere flere kontakter på en linje. Generelt "
+"brukes dette når samme person har flere Jabber kontoer eller transport "
+"kontoer."
+
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Ugyldig Fil"
+
+#: ../src/roster_window.py:3910
+#, 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 ønsker å sende deg en fil:"
+msgstr[1] "%s ønsker å sende deg en fil:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Nå vil \"%s\" kunne se din status."
+msgid "using account %s"
+msgstr "bruker kontoen %s"
 
-#: ../src/roster_window.py:2476
-msgid "Subscription request has been sent"
-msgstr "Abonnerings forespørsel er sendt"
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:2477
+#. disco
+#: ../src/roster_window.py:4679
 #, 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."
+msgid "using %s account"
+msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:2489
-msgid "Authorization has been removed"
-msgstr "Godkjenning har blitt fjernet"
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Behandle Bokmerker..."
 
-#: ../src/roster_window.py:2490
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
+msgid "of account %s"
+msgstr "for konto %s"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
+msgid "for account %s"
+msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:2684
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han eller henne alltid vil se deg som frakoblet."
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:2689
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-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:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publisér"
 
-#: ../src/roster_window.py:2692
-msgid "I want this contact to know my status after removal"
-msgstr "Denne kontakten skal kunne se min status etter fjerning"
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
 
-#. several contact to remove at the same time
-#: ../src/roster_window.py:2696
-msgid "Contacts will be removed from your roster"
-msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Aktiv"
 
-#: ../src/roster_window.py:2700
-#, python-format
-msgid ""
-"By removing these contacts:%s\n"
-"you also remove authorization resulting in them always seeing you as offline."
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Oppdag Tjenester..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
 msgstr ""
-"Ved å fjerne disse kontaktene:%s\n"
-"fjerner du også autorisasjonen som gjør at de alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:2732
-msgid "Gnomekeyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Gnomekeyring er installert men ikke startet riktig (systemvariabel er ikke satt riktig)"
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Send Gruppe M_elding"
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2760
-#: ../src/common/connection.py:596
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:2777
-msgid "Passphrase Required"
-msgstr "Passordsetning Kreves"
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Til alle påloggede brukere"
 
-#: ../src/roster_window.py:2778
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Skriv GPG nøkkelens passordsetning for konto %s."
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:2783
-msgid "Save passphrase"
-msgstr "Lagre passordsetning"
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2791
-msgid "Wrong Passphrase"
-msgstr "Feil Passordsetning"
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Send Melding"
 
-#: ../src/roster_window.py:2792
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transporter"
 
-#: ../src/roster_window.py:2849
-#: ../src/roster_window.py:2909
-msgid "You are participating in one or more group chats"
-msgstr "Du er med i en eller flere gruppesamtaler"
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Vis Trans_porter"
 
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2910
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-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:5788
+msgid "_Maximize"
+msgstr ""
 
-#: ../src/roster_window.py:2867
-msgid "No account available"
-msgstr "Ingen konto tilgjengelig"
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakt Frakoblet"
 
-#: ../src/roster_window.py:2868
-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:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Ny Gruppesamtale"
 
-#: ../src/roster_window.py:2966
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" etter %(artist)s"
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:3395
-#: ../src/roster_window.py:3402
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Meldinger vil kun være tilgjengelig for lesing senere dersom du har historikk påslått."
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:3986
-msgid "Metacontacts storage not supported by your server"
-msgstr "Metakontakter lagring støttes ikke av din server"
+#: ../src/roster_window.py:6207
+msgid "Change Status Message..."
+msgstr "Endre Status Melding..."
 
-#: ../src/roster_window.py:3988
-msgid "Your server does not support storing metacontacts information. So those information will not be save on next reconnection."
-msgstr "Din server støtter ikke lagring av metakontakt informasjon. Så denne informasjonen vil ikke bli lagret på neste oppkobling."
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
 
-#: ../src/roster_window.py:4030
-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/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
 
-#: ../src/roster_window.py:4032
-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 "Metakontakter er en måte å omgruppere flere kontakter på en linje. Generelt brukes dette når samme person har flere Jabber kontoer eller transport kontoer."
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
 
-#: ../src/roster_window.py:4199
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Slipp %s i samtalerom %s"
+msgid "Subject: %s"
+msgstr "Tittel: %s"
 
-#: ../src/roster_window.py:4206
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Gjør %s og %s metakontakter"
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
 
-#: ../src/roster_window.py:4393
-msgid "Change Status Message..."
-msgstr "Endre Status Melding..."
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
 
-#: ../src/systray.py:144
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Tilkobling"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontakt Frakoblet"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Rom:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Aktivert"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Skriv:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5226,1458 +9543,686 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "Tilhørighet: "
-
-#: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er ikke interessert i hans/hennes status."
-
-#: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/hun er ikke interessert i din."
-
-#: ../src/vcard.py:289
-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:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller han/hun i din."
-
-#: ../src/vcard.py:299
-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:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " ressurs med prioritet"
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "lager logg database"
-
-#: ../src/common/check_paths.py:89
-#: ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, 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:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim vill nå lukkes"
-
-#: ../src/common/check_paths.py:115
-#, 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:131
-#, python-format
-msgid "creating %s directory"
-msgstr "lager %s mappe"
-
-#: ../src/common/commands.py:69
-msgid "Change status information"
-msgstr "Endre statusinformasjon"
-
-#: ../src/common/commands.py:82
-msgid "Change status"
-msgstr "Endre status"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr "Sett fraværstype og beskrivelse"
-
-#: ../src/common/commands.py:89
-msgid "Free for chat"
-msgstr "Ledig for samtale"
-
-#: ../src/common/commands.py:90
-msgid "Online"
-msgstr "Tilkoblet"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Utvidet borte"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Ikke forstyrr"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Frakoblet - ikke kontakt"
-
-#: ../src/common/commands.py:99
-msgid "Presence description:"
-msgstr "Tilstedeværelses beskrivelse:"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Statusen har blitt endret."
-
-#: ../src/common/commands.py:179
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s fra %(room_jid)s"
-
-#: ../src/common/commands.py:183
-msgid "You have not joined a groupchat."
-msgstr "Du har ikke blitt med i en gruppesamtale."
-
-#: ../src/common/commands.py:189
-msgid "Leave Groupchats"
-msgstr "Gå ut av Gruppesamtale"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
-
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Gruppesamtaler"
-
-#: ../src/common/commands.py:230
-msgid "You leaved the following groupchats:"
-msgstr "Du gikk ut av følgende gruppesamtaler:"
-
-#: ../src/common/config.py:56
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tid i minutter før status endres til borte."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Borte på grunn av inaktivitet"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tid i minutter før status endres til ikke tilgjengelig."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Ikke tilgjengelig på grunn av inaktivitet"
-
-#: ../src/common/config.py:83
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
-
-#: ../src/common/config.py:88
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Slå på link-lokal/zeroconf meldinger"
-
-#: ../src/common/config.py:91
-msgid "Language used by speller"
-msgstr "Språk som brukes av ordlisten"
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Applikasjoner</b>"
 
-#: ../src/common/config.py:92
+#: ../src/vcard.py:319
 msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr ""
-"'always' - vis klokkeslett for hver melding.\n"
-"'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
-"'never' - aldri vis klokkeslett."
-
-#: ../src/common/config.py:93
-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 "Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til 4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
-
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Behandle * / _ par som mulige formaterings symboler."
-
-#: ../src/common/config.py:97
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli fjernet."
-
-#: ../src/common/config.py:100
-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 "Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ascii formatering dersom valgt. For syntax, se http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du installere docutils)"
-
-#: ../src/common/config.py:109
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i gruppesamtaler."
-
-#: ../src/common/config.py:110
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er opptatt av noen andre i samtalegruppen."
-
-#: ../src/common/config.py:133
-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 "Dette valget lar deg endre tidsformatet som skrives i samtaler. For eksempel \"[%H:%M] \" vil vise \"[hour:minute] \". Se python dokumentasjon på strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Tegn som skrives før kallenavnet i samtaler"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Tegn som skrives etter kallenavnet i samtaler"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Legg * og [n] inn i kontaktliste tittelen?"
-
-#: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane blir åpnet på nytt."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
-
-#: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ Klient standard oppførsel)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller 'WIKTIONARY' som betyr bruk wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
-
-#: ../src/common/config.py:154
-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 "Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status for kontoer (gitt at de ikke har listen_to_network_manager satt til False og at de synkroniserer med global status) basert på statusen til nettverks tilkoblingen."
-
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
-
-#: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, avslått."
-
-#: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis det hvert x minutt."
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Spør før lukking av gruppesamtale fane/vindu."
-
-#: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom separerte listen av rom jider."
-
-#: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms separerte listen av rom jider."
+"Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
+"ikke interessert i hans/hennes status."
 
-#: ../src/common/config.py:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med adresse oversetting/port videresending."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "Varsle om hendelser i system-statusfelt ikonet."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Vis fane når du har bare en samtale?"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Vis notatblokk faner i samtalevinduer?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Vis lukk knapp på fanen?"
-
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
-
-#: ../src/common/config.py:190
-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 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver oppstart."
-
-#: ../src/common/config.py:192
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste meldinger. Avhengig av valgte tema kan dette ikonet være animert."
-
-#: ../src/common/config.py:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-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:195
-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 "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:196
-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 "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:197
-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 "kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/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:199
-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:200
-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:202
-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:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Ikke vis kontaktbilde for transporten selv."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
-
-#: ../src/common/config.py:205
-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 "Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når det er ventende hendelser."
-
-#: ../src/common/config.py:207
-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 liker ikke sha informasjon når man går inn i et passord beskyttet samtalerom. Sett dette valget til False for å slutte å sende sha informasjon til gruppesamtaler"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/vcard.py:321
 msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before the changes will take effect."
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr ""
-"Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
-"'always' - Alle meldinger sendes til ett vindu.\n"
-"'never' - Alle meldinger får egne vindu.\n"
-"'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
-"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes til forskjellige vinduer. Merk, endring av dette valget krever omstart av Gajim før det aktiveres"
-
-#: ../src/common/config.py:211
-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:212
-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:213
-msgid "Hides the buttons in group chat window."
-msgstr "Gjemmer knappene i gruppe samtale vindu."
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Gjemmer knappene i to personers samtale vindu."
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Gjemmer tittel banneret i to personers samtale vindu"
-
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
-
-#: ../src/common/config.py:218
-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 "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:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
-
-#: ../src/common/config.py:221
-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:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt innhold mener at vi aldri viser dialogen."
-
-#: ../src/common/config.py:223
-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 "Dersom True vil du kunne sette en negativ prioritet til din konto i 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:224
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre konto passord."
-
-#: ../src/common/config.py:225
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter og gruppe rader. "
-
-#: ../src/common/config.py:226
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-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:237
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Prioritet vil endre automatisk i følge med din status. Prioritetene defineres i autopriority_* valgene."
-
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 omvei"
-
-#: ../src/common/config.py:270
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Dersom valgt vil Gajim bruke din IP og proxier definert i file_transfer_proxies valget for filoverføring."
-
-#: ../src/common/config.py:329
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
-
-#: ../src/common/config.py:330
-#: ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
-
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr "alle eller mellomroms separert status"
-
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', eller 'both'"
-
-#: ../src/common/config.py:341
-#: ../src/common/config.py:343
-#: ../src/common/config.py:344
-#: ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' eller ''"
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Sover"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Snart tilbake"
-
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Tilbake om noen minutter."
-
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Spiser"
-
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Jeg spiser, så legg igjen en beskjed"
-
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Film"
-
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Jeg ser på en film."
-
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Jobber"
-
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Jeg jobber."
-
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Jeg sitter i telefonen."
-
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Ute"
-
-#: ../src/common/config.py:360
-msgid "I'm out enjoying life."
-msgstr "Jeg er ute og lever livet."
-
-#: ../src/common/config.py:364
-msgid "I'm available."
-msgstr "Jeg er tilgjengelig."
-
-#: ../src/common/config.py:365
-msgid "I'm free for chat."
-msgstr "Ledig for prat."
-
-#: ../src/common/config.py:367
-msgid "I'm not available."
-msgstr "Jeg er ikke tilgjengelig."
-
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Ikke forstyrr."
-
-#: ../src/common/config.py:369
-#: ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Hade bra!"
-
-#: ../src/common/config.py:379
-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 "Lyd som spilles når en samtalerom melding inneholder et av ordene i muc_highlight_words, eller når en samtalerom melding inneholder ditt kallenavn."
-
-#: ../src/common/config.py:380
-msgid "Sound to play when any MUC message arrives."
-msgstr "Lyd som spilles når en ny samtalerom melding mottas."
-
-#: ../src/common/config.py:389
-#: ../src/common/optparser.py:193
-msgid "green"
-msgstr "grønn"
-
-#: ../src/common/config.py:393
-#: ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "varehandel"
-
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "menneskelig"
-
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "marine"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Klarer ikke å uvirksom modulen"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "Feil maskinnavn"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "The host you configured as the ft_override_host_to_send advanced option is not valid, so ignored."
-msgstr "Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke gyldig, så den ignoreres."
-
-#: ../src/common/connection_handlers.py:590
-#, 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:1540
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kallenavn ikke lovlig: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1602
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1625
-msgid "Unable to join group chat"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+"Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
+"hun er ikke interessert i din."
 
-#: ../src/common/connection_handlers.py:1603
-msgid "A password is required to join this group chat."
-msgstr "Et passord kreves for å bli med i dette samtalerommet."
-
-#: ../src/common/connection_handlers.py:1606
-msgid "You are banned from this group chat."
-msgstr "Du er uønsket i dette samtalerommet."
-
-#: ../src/common/connection_handlers.py:1609
-msgid "Such group chat does not exist."
-msgstr "Et slikt samtalerom finnes ikke."
-
-#: ../src/common/connection_handlers.py:1612
-msgid "Group chat creation is restricted."
-msgstr "Gruppesamtale oppretting er begrenset."
-
-#: ../src/common/connection_handlers.py:1615
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerte kallenavn må bli brukt. "
-
-#: ../src/common/connection_handlers.py:1618
-msgid "You are not in the members list."
-msgstr "Du er ikke medlems listen."
-
-#: ../src/common/connection_handlers.py:1626
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
+#: ../src/vcard.py:323
+msgid "You and the contact are interested in each other's presence information"
 msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
-
-#: ../src/common/connection_handlers.py:1676
-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:1697
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abonnerer nå på %s"
-
-#: ../src/common/connection_handlers.py:1699
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
-
-#: ../src/common/connection_handlers.py:1701
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abonnerer ikke lenger på %s"
-
-#: ../src/common/connection_handlers.py:1871
-#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å fjerne den"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Tilkobling til konto \"%s\" har blitt mistet"
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Automatisk tilkobling."
-
-#: ../src/common/connection.py:187
-#: ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Ugyldig svar"
-
-#: ../src/common/connection.py:405
-#: ../src/common/connection.py:440
-#: ../src/common/connection.py:898
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Kunne ikke koble til \"%s\""
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Tilkoblet til server %s:%s med %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Autentisering feilet med \"%s\""
-
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
-
-#: ../src/common/connection.py:495
-msgid "Error while removing privacy list"
-msgstr "Feil ved fjerning av liste over uønskede"
-
-#: ../src/common/connection.py:496
-#, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Desactivate it and try again."
-msgstr "Listen over utestengte %s har ikke blitt fjernet. Den er kanskje aktiv i en av dine tilkoblede ressurser. Deaktiver den og prøv igjen."
+"Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
-#. We didn't set a passphrase
-#: ../src/common/connection.py:594
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passordsetning ble ikke gitt"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:636
-msgid "invisible"
-msgstr "usynlig"
-
-#: ../src/common/connection.py:637
-msgid "offline"
-msgstr "frakoblet"
-
-#: ../src/common/connection.py:638
-#, python-format
-msgid "I'm %s"
-msgstr "Jeg er %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:729
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
-
-#: ../src/common/connection.py:785
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
+#. None
+#: ../src/vcard.py:325
 msgid ""
-"Subject: %s\n"
-"%s"
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr ""
-"Tittel: %s\n"
-"%s"
+"Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
+"han/hun i din."
 
-#: ../src/common/connection.py:924
-msgid "Not fetched because of invisible status"
-msgstr "Ikke hentet på grunn av usynlig status"
-
-#: ../src/common/contacts.py:271
-msgid "Not in roster"
-msgstr "ikke i kontaktliste"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindinger mangler på denne maskinen"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
-
-#: ../src/common/exceptions.py:30
-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:38
-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/vcard.py:332
+msgid "You are waiting contact's answer about your subscription request"
+msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Sesjons bussen er ikke tilgjengelig.\n"
-"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "en"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "to"
-
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "tre"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " ressurs med prioritet"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "fire"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP Kryptering"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "fem"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "seks"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "syv"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say "
+#~ "før teksten)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "åtte"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
+#~ "tredje person. (f.eks. /%s explodes.)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "ni"
+#~ msgid "Encryption enabled"
+#~ msgstr "Kryptering påslått"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "ti"
+#~ msgid "Encryption disabled"
+#~ msgstr "Kryptering avslått"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "elleve"
+#~ msgid "_Retype Password:"
+#~ msgstr "_Repeter Passord:"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "tolv"
+#~ msgid "_Use proxy"
+#~ msgstr "_Bruk proxy"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "klokken $0"
+#~ msgid ""
+#~ "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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel "
+#~ "samtale klient (som iChat, Trillian eller Gaim) vil vises i "
+#~ "kontaktlisten. Du trenger ikke være koblet til en jabber server for at "
+#~ "det skal virke.\n"
+#~ "Dette er bare tilgjengelig dersom python-avahi er installert og avahi-"
+#~ "tjenesten kjører."
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem over $0"
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste "
+#~ "alle kontakter som om du hadde en konto"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ti over $0"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Slå på link-lokale meldinger"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart over $0"
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "ti på halv $1"
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo og Julie</small>"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fem på halv $1"
+#~ msgid "Old stories"
+#~ msgstr "Gamle historier"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "halv $1"
+#~ msgid "Soliloquy"
+#~ msgstr "Enetale"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "fem over halv $1"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "ti over halv $1"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvart på $1"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klikk for å se tidligere samtaler i dette rommet"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ti på $1"
+#~ msgid "Build custom query"
+#~ msgstr "Lag din egen spørring"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fem på $1"
+#~ msgid "Query Builder..."
+#~ msgstr "Spørrings Bygger..."
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1"
+#~ msgid "Accept"
+#~ msgstr "Godkjenn"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Natt"
+#~ msgid "Invitation Received"
+#~ msgstr "Invitasjon motatt"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Tidlig morgen"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Morning"
-msgstr "Morgen"
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Grensenitt valg</b>"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr "Nesten formiddag"
+#~ msgid "Also known as iChat style"
+#~ msgstr "Også kjent som iChat stil"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Noon"
-msgstr "Middag"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Et eksempel: Dersom du har slått på status melding for borte, så vil "
+#~ "Gajim ikke spør flere ganger etter melding når du endrer status til "
+#~ "borte; den vil bruke standard meldingen du lager her"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Ettermiddag"
+#~ msgid "Chat"
+#~ msgstr "Samtale"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Evening"
-msgstr "Ettermiddag"
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Bestemt av sender\n"
+#~ "Samtale melding\n"
+#~ "Enkel melding"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Sen kveld"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "H_vert 5 minutt"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Starten av uken"
+#~ msgid "Events"
+#~ msgstr "Hendelser"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Midten av uken"
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr ""
+#~ "Gajim vil automatisk vise deg nye hendelser ved å sprette opp det "
+#~ "relative vinduet"
 
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Slutten av uken"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
 
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Helg!"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på "
+#~ "skjermen om at en kontakt har akkurat logget inn"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Ugyldig karakter i brukernavn."
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim vil bare endre ikonet til kontakten som har sendt den nye hendelsen"
 
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Server adresse kreves."
+#~ 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 ""
+#~ "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
+#~ "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Ugyldig karakter i domene navn."
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Aldri\n"
+#~ "Alltid\n"
+#~ "Per konto\n"
+#~ "Per type"
 
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Ugyldig karakter i ressurs."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Utgående Samtale status opp_lysninger:"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "Print time:"
+#~ msgstr "Utskrifts tid:"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Sett status til å vise navnet på _musikk som spilles"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "Show only in _roster"
+#~ msgstr "Vis bare i _kontaktliste"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ msgid "The auto away status message"
+#~ msgstr "Den automatiserte borte meldinen"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "The auto not available status message"
+#~ msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Behandle alle innkommende meldinger som:"
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Opptatt"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Opptatt"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil "
+#~ "følgende metoder kunne bli brukt for å informere deg om det. Vennligst "
+#~ "merk at ny melding hendelser vil bare skje dersom du får en ny melding "
+#~ "fra en kontakt du ikke er i samtale med."
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_Ikke Tilgjengelig"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du "
+#~ "besøke http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Ledig for Samtale"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Avanserte Innstillinger for Hendelsesmeldinger..."
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Ledig for Prat"
+#~ msgid "_Font:"
+#~ msgstr "_Font:"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Tilgjengelig"
+#~ msgid "_Never"
+#~ msgstr "_Aldri"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Tilgjengelig"
+#~ msgid "_Notify me about it"
+#~ msgstr "_Gi meg beskjed om det"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Kobler til"
+#~ msgid "_Player:"
+#~ msgstr "_Spiller:"
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "B_orte"
+#~ msgid "_Pop it up"
+#~ msgstr "_Sprett opp"
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Frakoblet"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Frakoblet"
+#~ msgid "Address"
+#~ msgstr "Adresse"
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "_Usynlig"
+#~ msgid "City:"
+#~ msgstr "By:"
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "?contact has status:Ukjent"
+#~ msgid "Company:"
+#~ msgstr "Bedrift:"
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "?contact has status:Har feilmeldinger"
+#~ msgid "Country:"
+#~ msgstr "Land:"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "?Subscription we already have:Ingen"
+#~ msgid "Given:"
+#~ msgstr "Fornavn:"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Til"
+#~ msgid "Middle:"
+#~ msgstr "Mellomnavn:"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Begge"
+#~ msgid "Position:"
+#~ msgstr "Plassering:"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "?Ask (for Subscription):Ingen"
+#~ msgid "Prefix:"
+#~ msgstr "Tittel:"
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Abonnér"
+#~ msgid "Role:"
+#~ msgstr "Rolle:"
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "?Group Chat Contact Role:Ingen"
+#~ msgid "State:"
+#~ msgstr "Fylke:"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Ordstyrere"
+#~ msgid "Suffix:"
+#~ msgstr "Suffix:"
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Ordstyrer"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Deltakere"
+#~ msgid "A_ccounts"
+#~ msgstr "_Kontoer"
 
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Deltaker"
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
 
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Besøkende"
+#~ msgid "Ask:"
+#~ msgstr "Spør:"
 
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Besøk"
+#~ msgid "Client:"
+#~ msgstr "Klient:"
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Group Chat Contact Affiliation:Ingen"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "Eier"
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "Administrator"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så "
+#~ "vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør "
+#~ "du export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile "
+#~ "eller i den globale /etc/profile.\n"
+#~ "\n"
+#~ "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "Medlem"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Hvert %s _minutt"
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "er fokusert på en annen samtale"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "gjør noe annet"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "skriver en melding..."
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s er nå %s (%s)"
 
-#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "tok pause i skriving av en melding"
+#~ msgid "%s is now %s"
+#~ msgstr "%s er nå %s"
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "har lukket samtalevinduet eller fanen"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Fra: %(from_address)s"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d ulest melding"
-msgstr[1] "%d uleste meldinger"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Manager støtte er ikke tilgjengelig"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d ulest enkelt melding"
-msgstr[1] "%d uleste enkelt meldinger"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d ulest gruppesamtale melding"
-msgstr[1] "%d uleste gruppesamtale meldinger"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Bruk: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d ulest privat melding"
-msgstr[1] "%d uleste private meldinger"
+#~ msgid "Private Chat"
+#~ msgstr "Privat Samtale"
 
-#: ../src/common/helpers.py:909
-#: ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "Group Chat"
+#~ msgstr "Gruppe Samtale"
 
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "feil: kan ikke åpne %s for lesing"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/optparser.py:188
-#: ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "turkis"
+#~ msgid "_New group chat"
+#~ msgstr "_Ny gruppe samtale"
 
-#: ../src/common/optparser.py:306
-msgid "migrating logs database to indices"
-msgstr "migrerer logg databaser til indekser"
+#~ msgid "_Log on"
+#~ msgstr "_Logg på"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim konto %s"
+#~ msgid "Log _off"
+#~ msgstr "Logg _av"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Tilkobling til maskinen kunne ikke opprettes: Feil svar fra serveren."
+#~ msgid "Save passphrase"
+#~ msgstr "Lagre passordsetning"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "Tilkobling til maskin kunne ikke opprettes"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Slipp %s i samtalerom %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av data."
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
+#~ msgid "Affiliation:"
+#~ msgstr "Tilhørighet: "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "For å sende og motta meldinger må du koble til på nytt."
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Gjemmer knappene i to personers samtale vindu."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Avahi feil"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Link-lokal meldinger fungerer muligens ikke riktig."
+#~ msgid "invisible"
+#~ msgstr "usynlig"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Vennligst sjekk om Avahi er installert."
+#~ msgid "offline"
+#~ msgstr "frakoblet"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "Kunne ikke starte lokal tjeneste"
+#~ msgid "I'm %s"
+#~ msgstr "Jeg er %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Klarer ikke å lytte til port %d."
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d ulest enkelt melding"
+#~ msgstr[1] "%d uleste enkelt meldinger"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d ulest gruppesamtale melding"
+#~ msgstr[1] "%d uleste gruppesamtale meldinger"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Kunne ikke endre status til konto \"%s\""
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d ulest privat melding"
+#~ msgstr[1] "%d uleste private meldinger"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke sendes."
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Denne meldingen er kryptert]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Tilkobling til maskinen kunne ikke opprettes: Feil svar fra serveren."
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Feil ved tilføying av tjeneste. %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Tilkobling til maskin kunne ikke opprettes"
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "E_tter kallenavn:"
+
 #~ msgid "B_efore nickname:"
 #~ msgstr "F_ør kallenavn:"
+
 #~ msgid "_After time:"
 #~ msgstr "_Etter tid:"
+
 #~ msgid "_Before time:"
 #~ msgstr "_Før tid:"
-#~ msgid "_Publish"
-#~ msgstr "_Publisér"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Hent"
+
 #~ msgid "Information published"
 #~ msgstr "Informasjon publisert"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
+
 #~ msgid "_New room"
 #~ msgstr "Nytt Rom"
+
 #~ msgid "Role: "
 #~ msgstr "Rolle: "
-#~ msgid "Affiliation: "
-#~ msgstr "Tilhørighet: "
+
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
 #~ msgstr ""
 #~ "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 #~ "aktiv når notify_on_all_muc_messages er True)"
+
 #~ msgid "Add"
 #~ msgstr "Adresse"
+
 #~ msgid "Away "
 #~ msgstr "Borte"
+
 #~ msgid "Down"
 #~ msgstr "Last ned"
+
 #~ msgid "List of special notifications settings"
 #~ msgstr "Legg til Spesiell Alarm for %s"
+
 #~ msgid "Not Available "
 #~ msgstr "Ikke tilgjengelig"
+
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_Info"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ugyldig rom eller servernavn"
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Ukjent D-Bus versjon: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard publisering vellykket"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Din personlige informasjon har blitt publisert uten feil."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrerer Logger..."
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d ulest melding"
 #~ msgstr[1] "Gajim - %d uleste meldinger"
+
 #~ msgid "Since %s"
 #~ msgstr "Siden %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
+
 #~ msgid "Send File"
 #~ msgstr "Send Fil"
-#~ msgid "Underline"
-#~ msgstr "Strek Under"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "_Bli med i Nytt Rom"
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr ""
-#~ "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
+
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Vennligst velg ett av valgene under:</b>"
+
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Slett Melding for Dagen"
-#~ msgid "I want a notification popup:"
-#~ msgstr "Samtale status opp_lysninger:"
+
 #~ msgid "I want to listen to:"
 #~ msgstr "%s ønsker å sende deg en fil:"
+
 #~ msgid "Send _New Message..."
 #~ msgstr "Send _Ny Melding..."
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "Velg Melding for Dagen"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "Oppdater Melding for Dagen"
+
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsoll..."
-#~ msgid "Choose Avatar"
-#~ msgstr "Velg Bilde"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et samtale vindu"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et gruppe samtale vindu"
-#~ msgid "plain"
-#~ msgstr "enkel"
+
 #~ msgid "Send"
 #~ msgstr "Send"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s har sendt deg en ny melding."
+
 #~ msgid "GUI Migration failed"
 #~ msgstr "vCard publisering feilet"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Loggene ble migrert til databasen uten feil."
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
+
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start samtale med konto %s"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
+
 #~ msgid "Size: "
 #~ msgstr "Størrelse: "
+
 #~ msgid "Session bus is not available"
 #~ msgstr "Sesjons buss ikke tilgjengelig"
+
 #~ msgid "Sound"
 #~ msgstr "Lyd"
+
 #~ msgid "Image"
 #~ msgstr "Bilde"
-#~ msgid "From %s"
-#~ msgstr "Fra %s"
+
 #~ msgid "To %s"
 #~ msgstr "Til %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "Du har blitt invitert til %(room_jid)s rommet av %(contact_jid)s"
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "Behandle Uttrykksikoner"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "Eller velg en forhåndsvalgt melding:"
+
 #~ msgid "Use _emoticons"
 #~ msgstr "Bruk _uttrykksikoner"
+
 #~ msgid "_Set Image..."
 #~ msgstr "_Velg Bilde..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "Endre til %s"
+
 #~ msgid "using account "
 #~ msgstr "bruker konto"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "Filstørrelsen på bilde \"%s\" er for stor"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "Filen må ikke være mer enn 32 kilobyte."
+
 #~ msgid "Timeout"
 #~ msgstr "Tidsavbrudd"
+
 #~ msgid "account: "
 #~ msgstr "konto:"
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "Fjern valgte filoverføring"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "Stopp valgte filoverføring"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr ""
 #~ "Dersom du lukke denne fanen og du har slått av historikk, vil meldingen "
 #~ "bli borte."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan ikke fjerne den siste gruppen"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Du må ha minst en kontakt gruppe."
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6687,12 +10232,10 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #~ "installert pysqlite2, og om du ønsker å migrere loggene dine til den nye "
 #~ "databasen, vennligst les:http://trac.gajim.org/wiki/MigrateLogToDot9DB "
 #~ "Avslutter..."
-#~ msgid "Image is too big"
-#~ msgstr "Bilde er for stort"
+
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
 #~ msgstr ""
 #~ "Bilde for uttrykksikon må være mindre enn eller lik 24 piksler i bredde "
 #~ "og 24 i høyde."
-
diff --git a/po/pl.po b/po/pl.po
index a7e649fd6..33a6b03d1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-19 08:18+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2006-11-08 09:01+0100\n"
 "Last-Translator: Maciej Chojnacki <maciej.chojnacki@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -292,9 +292,9 @@ msgstr "Zmień informacje o sobie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1040
-#: ../src/common/helpers.py:1052 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -303,11 +303,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2657
-#: ../src/roster_window.py:5140
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Ogólne"
 
@@ -371,20 +371,20 @@ msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1550
-#: ../src/config.py:2050
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1458 ../src/config.py:1463
-#: ../src/config.py:1958 ../src/config.py:2036 ../src/config.py:2049
-#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2726
-#: ../src/roster_window.py:2732 ../src/roster_window.py:2737
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Żaden"
 
@@ -469,6 +469,7 @@ msgstr "Synch_ronizuj status konta z globalnym statusem"
 
 #: ../data/glade/account_modification_window.glade.h:43
 #: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Synchronizuj kontakty"
@@ -548,7 +549,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -563,7 +564,7 @@ msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5091
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
@@ -782,7 +783,7 @@ msgid "All statuses"
 msgstr "Dowolny status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:287
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Zaraz wracam"
 
@@ -799,7 +800,7 @@ msgid "Have "
 msgstr "rozmawiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -808,7 +809,7 @@ msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Nieobecny"
 
@@ -1042,7 +1043,7 @@ msgstr "Dod_aj do listy kontaktów"
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historia"
 
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -1159,7 +1160,7 @@ msgstr "_Kontynuuj"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
@@ -1207,7 +1208,7 @@ msgstr "Wybieranie motywów dla Gajim"
 msgid "Gone"
 msgstr "Zniknął"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Nieaktywny"
 
@@ -1315,7 +1316,7 @@ msgstr "_Głos"
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:312
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Od"
 
@@ -1371,7 +1372,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Szukaj w bazie"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
@@ -1394,7 +1395,7 @@ msgstr "Szukaj"
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1689
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -1523,7 +1524,8 @@ 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 (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Zmień temat pokoju (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1553,7 +1555,7 @@ msgstr "Pokaż profil kontaktu (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Wyślij"
 
@@ -1720,10 +1722,6 @@ 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:46
-msgid "Emoticons:"
-msgstr "Emotikony:"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1733,7 +1731,7 @@ msgstr ""
 "W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w "
 "oknie rozmowy."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1742,7 +1740,7 @@ msgstr ""
 "Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
 "W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1750,11 +1748,11 @@ 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:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Ukryj przyciski w oknie rozmowy"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1762,7 +1760,7 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1770,14 +1768,14 @@ 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:54
+#: ../data/glade/preferences_window.glade.h:53
 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:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1785,7 +1783,7 @@ 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:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1793,7 +1791,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1801,28 +1799,28 @@ 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:58
+#: ../data/glade/preferences_window.glade.h:57
 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:59
+#: ../data/glade/preferences_window.glade.h:58
 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:60
+#: ../data/glade/preferences_window.glade.h:59
 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:61
+#: ../data/glade/preferences_window.glade.h:60
 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 "
@@ -1832,7 +1830,7 @@ msgstr ""
 "w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje "
 "słownika domyślnego."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1842,7 +1840,7 @@ msgstr ""
 "wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
 "wszystkich wiadomości od osób, których nie masz na liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:62
 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 "
@@ -1852,7 +1850,7 @@ msgstr ""
 "przez GPG oraz E2E. W przypadku E2E zgodę na logowanie wyrazić musi "
 "rozmówca. Jeżeli zgoda nie zostanie udzielona, wiadomości NIE BĘDĄ logowane."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1860,15 +1858,7 @@ 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:65
-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"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1878,7 +1868,7 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1886,7 +1876,7 @@ 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:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1894,47 +1884,43 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
 "emotikonami graficznymi"
 
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignoruj wzbogaconą treść w wiadomościach"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Loguj _zaszyfrowane wiadomości"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "_Spraw by okna rozmowy były zwarte"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Powiadom mnie o kontaktach, które się _logują"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Zdarzenia"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1944,19 +1930,19 @@ msgstr ""
 "Powiadom mnie o tym\n"
 "Pokaż tylko w rosterze"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1965,23 +1951,28 @@ msgstr ""
 "formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
 "dodatki i wyświetlał czysty tekst."
 
-#: ../data/glade/preferences_window.glade.h:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Sortuj kontakty według statusu"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "Zestaw ikon _statusu:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -1989,7 +1980,7 @@ msgstr ""
 "Opis atomatycznego statusu Zaraz wracam. Jeśli pusty, Gajim nie zmieni "
 "aktualnego opisu"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -1997,42 +1988,52 @@ msgstr ""
 "Opis automatycznego statusu Niedostępny. Jeśli pusty, Gajim nie zmieni "
 "aktualnego opisu"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "Wyświetlaj informacje stanie kontaktu:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emotikony:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 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:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignoruj wzbogaconą treść w wiadomościach"
+
 #: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Wiadomość _otrzymana:"
@@ -2066,22 +2067,28 @@ msgid "_Send chat state notifications:"
 msgstr "Rodzaje powiadomień wysyłanych podczas rozmowy:"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "Sortuj kontakty według statusu"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "_Podświetlanie URL:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "_Zachowanie okna:"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Dołącz do _pokoju"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Spoza listy kontaktów"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutach"
 
@@ -2129,7 +2136,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2558
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Lista prywatności"
 
@@ -2273,7 +2280,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Rola:</b>"
 
@@ -2333,8 +2340,8 @@ msgstr "Usuń konto z Gajima i z _serwera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5128
-#: ../src/roster_window.py:5605 ../src/roster_window.py:5734
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Usuń"
 
@@ -2356,14 +2363,14 @@ msgstr "Modyfikuj _grupy..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5677
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5046 ../src/roster_window.py:5558
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "_Zaproś do"
 
@@ -2374,7 +2381,7 @@ msgstr "_Usuń"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5056 ../src/roster_window.py:5643
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
@@ -2400,8 +2407,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Pozwól mu/jej widzieć swój status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5119 ../src/roster_window.py:5595
-#: ../src/roster_window.py:5724
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Zablokuj"
 
@@ -2427,8 +2434,8 @@ msgid "_Subscription"
 msgstr "_Autoryzacja"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5113 ../src/roster_window.py:5589
-#: ../src/roster_window.py:5721
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
@@ -2527,7 +2534,7 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5746
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
@@ -2619,6 +2626,10 @@ msgstr "Prośba o autoryzację"
 msgid "_Deny"
 msgstr "O_dmów"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
+
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
@@ -2746,13 +2757,13 @@ msgstr "Przypisz klucz Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5578
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5704
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
@@ -2803,49 +2814,48 @@ msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktywny"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Nieaktywny"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Zmienna logiczna"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Kolor"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nazwa opcji"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Brak)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Ukryte"
 
@@ -2854,149 +2864,149 @@ msgstr "Ukryte"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "angielski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "bretoński"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "czeski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "niemiecki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "grecki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "brytyjski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "hiszpański"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "baskijski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "francuski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "włoski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "norweski (b)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "holenderski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "polski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "portugalski (Brazylia)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "serbski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "słowacki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1147 ../src/chat_control.py:1535
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2030
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:299 ../src/conversation_textview.py:844
-#: ../src/dialogs.py:895 ../src/gajim.py:1626 ../src/roster_window.py:925
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1527
-#: ../src/roster_window.py:1869 ../src/roster_window.py:3095
-#: ../src/roster_window.py:3119 ../src/roster_window.py:5240
-#: ../src/roster_window.py:5424
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1298 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: ../src/chat_control.py:1300 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: ../src/chat_control.py:1302 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: ../src/chat_control.py:1306 ../src/tooltips.py:641
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, fuzzy, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3005,88 +3015,99 @@ msgstr ""
 "<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1311
+#: ../src/chat_control.py:1314
 #, fuzzy, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
 "from %(source)s"
 msgstr "\"%(title)s\" w wykonaniu %(artist)s"
 
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
-#: ../src/chat_control.py:1525
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1552
+#: ../src/chat_control.py:1560
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1570
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:1570
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1580
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1584
 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:1586
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1632
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1643 ../src/groupchat_control.py:1575
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/chat_control.py:1646 ../src/groupchat_control.py:1589
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1594
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1610
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3095,41 +3116,41 @@ msgstr ""
 "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
 "trzeciej osobie (np. /%s eksploduje.)"
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
 
-#: ../src/chat_control.py:1660
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
 
-#: ../src/chat_control.py:1663 ../src/groupchat_control.py:1633
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/chat_control.py:1794
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1807
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:1804
+#: ../src/chat_control.py:1810
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1806
+#: ../src/chat_control.py:1812
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:1811
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3137,25 +3158,25 @@ msgstr ""
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:1813
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:1842 ../src/chat_control.py:1855
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1854
 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:2209
+#: ../src/chat_control.py:2225
 #, 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:2210
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3163,18 +3184,22 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/chat_control.py:2361 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: ../src/chat_control.py:2362 ../src/gajim.py:171
+#: ../src/chat_control.py:2377
 #, 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:2594
+#: ../src/chat_control.py:2608
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
@@ -3244,40 +3269,40 @@ msgstr "Status opisowy"
 msgid "The status has been changed."
 msgstr "Status został zmieniony."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Opuść pokoje"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
 #, 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:195
 msgid "You have not joined a groupchat."
 msgstr "Nie dołączyłeś do pokoju."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
 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:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:793 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1531 ../src/roster_window.py:5016
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Pokoje"
 
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "Opuściłeś pokoje:"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
 
@@ -3320,20 +3345,20 @@ msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte
 
 #. sorted alphanum
 #: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3092
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "domyślny"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Uaktywnij komunikację link-local/zeroconf"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Język używany przez słownik"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3344,7 +3369,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 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. "
@@ -3355,18 +3380,18 @@ msgstr ""
 "najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
 "opcja print_time ustawiona jest na 'sometimes'."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 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:127
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3376,7 +3401,7 @@ msgstr ""
 "zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
 "http://docutils.sourceforge.net/docs/ref/rst/"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3384,7 +3409,7 @@ msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3392,7 +3417,7 @@ msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3403,18 +3428,14 @@ msgstr ""
 "minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy przed nazwą użytkownika"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy za nazwą użytkownika"
 
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "Nazwa użytkownika serwisu Last.fm."
-
 #: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
@@ -3750,7 +3771,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Lista kolorów, które używane będą do kolorowania nicków w oknach czatu."
 
@@ -3978,7 +4002,7 @@ msgstr "'yes', 'no' lub 'both'"
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Śpię"
 
@@ -3990,7 +4014,7 @@ msgstr "Niedługo wrócę"
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Jem"
 
@@ -4006,7 +4030,7 @@ msgstr "Film"
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Praca"
 
@@ -4038,7 +4062,7 @@ msgstr "Dostępny."
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:427 ../src/config.py:1390
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
@@ -4067,11 +4091,11 @@ msgstr ""
 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:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "grocery"
 
@@ -4102,25 +4126,36 @@ msgstr "Niepoprawny adres lokalny? :-O"
 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:926
-#: ../src/common/connection_handlers.py:1836
-#: ../src/common/connection_handlers.py:1876
-#: ../src/common/connection_handlers.py:2052
-#: ../src/common/connection_handlers.py:2171 ../src/common/connection.py:1211
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:851
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1945
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
@@ -4128,70 +4163,70 @@ msgstr "Pseudonim jest niedozwolony: %s"
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2014
-#: ../src/common/connection_handlers.py:2017
-#: ../src/common/connection_handlers.py:2020
-#: ../src/common/connection_handlers.py:2023
-#: ../src/common/connection_handlers.py:2027 ../src/gajim.py:546
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:2015
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2018
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:2021
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:2024
+#: ../src/common/connection_handlers.py:2063
 #, 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:2028
+#: ../src/common/connection_handlers.py:2067
 #, 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:2063
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:2070
+#: ../src/common/connection_handlers.py:2116
 #, 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:2097
+#: ../src/common/connection_handlers.py:2143
 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:2118
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:2122
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:2290
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4202,214 +4237,214 @@ msgstr ""
 "jabberstudio.org/ aby go usunąć"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2317
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Nie można uzyskać CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nie można odszyfrować podpisu certyfikatu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nie można odszyfrować podpisu CRL"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Nie można odkodować klucza publicznego wystawcy"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Błąd podpisu certyfikatu"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "Błąd podpisu CRL"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Certyfikat nie jest prawidłowy"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL nie jest prawidłowy"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL wygasł"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Błąd w polu notBefore certyfikatu"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Błąd w polu notAfter certyfikatu"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Błąd w polu lastUpdate CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Błąd w polu nextUpdate CRL"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Certyfikat podpisany przez wystawcę"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "W łańcuchu certyfikatów znaleziono certyfikat podpisany przez wystawcę"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "Nie można pobrać lokalnego certyfikatu wystawcy"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "Nie można zweryfikować pierwszego certyfikatu"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Za długi łańcuch certyfikatów"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Niepoprawny certyfikat CA"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Stała długości ścieżki przekroczona"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Nieznany cel certyfikatu"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Certyfikat niezaufany"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr "Niezgodność subject/issuer"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr "Tym kluczem nie można podpisywać certyfikatu"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Serwer %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
 
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
 
-#: ../src/common/connection.py:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Połączenie z proxy nie powiodło się"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:713
-#: ../src/common/connection.py:1340
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1042
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:645 ../src/common/connection.py:693
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:646 ../src/common/connection.py:694
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
 #, fuzzy, 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:668
+#: ../src/common/connection.py:666
 #, 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:671
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4418,7 +4453,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:673
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4427,24 +4462,24 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:741
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:802
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:803
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4472,7 +4507,7 @@ msgstr "Klucz kontaktu (%s) nie pasuje do klucza przypisanego w Gajimie."
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, fuzzy, python-format
 msgid ""
@@ -4482,32 +4517,32 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1373
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:792 ../src/roster_window.py:827
-#: ../src/roster_window.py:1454 ../src/roster_window.py:1521
-#: ../src/roster_window.py:1523 ../src/roster_window.py:1666
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 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:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
@@ -4689,206 +4724,206 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:161
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:172
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:280 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:322
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:398
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:405
 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:405
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
-#: ../src/common/helpers.py:989 ../src/common/helpers.py:996
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4896,22 +4931,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:1002
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1005 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1007
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1014 ../src/common/helpers.py:1021
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4919,22 +4954,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:1054
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -4948,567 +4983,701 @@ msgstr "Konto Gajim'a %s"
 msgid "Afraid"
 msgstr "Obawiam się"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Zadziwiony"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Podejrzliwy"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Zły"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Zdenerwowany"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 #, fuzzy
 msgid "Anxious"
 msgstr "Niecierpliwy"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 #, fuzzy
 msgid "Aroused"
 msgstr "Podejrzliwy"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Zawstydzony"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Znudzony"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Odważny"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Spokojny"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Ciekawy"
+
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cold"
 msgstr "Wytłuszczone"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Zawartość"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Zmieszany"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "zadowolony"
+
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contented"
 msgstr "zadowolony"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Cranky"
 msgstr "zakręcony"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "zakręcony"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Nieaktywny"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Ciekawy"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Usuń"
+
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Depressed"
 msgstr "smutny"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 #, fuzzy
 msgid "Disappointed"
 msgstr "rozczarowany"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disgusted"
 msgstr "zniesmaczony"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Wyłączone"
+
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Distracted"
 msgstr "rozproszony"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Embarrassed"
 msgstr "zawstydzony"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Niecierpliwy"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Podniecony"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Flirtatious"
 msgstr "gotowy do flirtu"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Sfrustrowany"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "jeżdzę"
+
+#: ../src/common/pep.py:63
 #, fuzzy
 msgid "Grumpy"
 msgstr "zrzędliwy"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Winny"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Szczęśliwy"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Gorący"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Humbled"
 msgstr "upokorzony"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 #, fuzzy
 msgid "Humiliated"
 msgstr "poniżony"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Głodny"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 #, fuzzy
 msgid "Hurt"
 msgstr "zraniony"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 #, fuzzy
 msgid "Impressed"
 msgstr "pod wrażeniem"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "In Awe"
 msgstr "wstrząśnięty"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Zakochany"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 #, fuzzy
 msgid "Indignant"
 msgstr "oburzony"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 #, fuzzy
 msgid "Interested"
 msgstr "zainteresowany"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 #, fuzzy
 msgid "Intoxicated"
 msgstr "pijany"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Invincible"
 msgstr "niepokonany"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Zazdrosny"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Samotny"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Skromny"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Nastrój"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nerwowy"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 #, fuzzy
 msgid "Offended"
 msgstr "obrażony"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Sfrustrowany"
+
+#: ../src/common/pep.py:89
 #, fuzzy
 msgid "Playful"
 msgstr "swawolny"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Dumny"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "zadowolony"
+
+#: ../src/common/pep.py:92
 #, fuzzy
 msgid "Relieved"
 msgstr "zadowolony"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Remorseful"
 msgstr "skruszony"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 #, fuzzy
 msgid "Restless"
 msgstr "niespokojny"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Smutny"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Sarkastyczny"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Ostatnio zmodyfikowany:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Poważny"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Zszokowany"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Nieśmiały"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Chory"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Śpiący"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Zestresowany"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Zaskoczony"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Spragniony"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Czas"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "dziewiąta"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Zmartwiony"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 #, fuzzy
 msgid "Doing Chores"
 msgstr "krzątam_się"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Buying Groceries"
 msgstr "na_zakupach"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Czyszczę"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Gotuję"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Naprawiam"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Zmywam_Naczynia"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Piorę"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 #, fuzzy
 msgid "Gardening"
 msgstr "pracuję_w_ogrodzie"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Running an Errand"
 msgstr "Biegam na posyłki"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Wyprowadzam Psa"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Piję"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Hiję_Piwo"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Piję_Kawę"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Piję_Herbatę"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Coś_Przegryzam"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Jem_Śniadanie"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Jem_Obiad"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Jem_Lunch"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Ćwiczę"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Jeżdżę_Na_Rowerze"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Czyszczę"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Wspinam Się"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Uprawiam Sport"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Biegam"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Na nartach"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Pływam"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 #, fuzzy
 msgid "Working out"
 msgstr "Ćwiczę"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Grooming"
 msgstr "pokój"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "W_Salonie_Spa"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Myję_Zęby"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "U_Fryzjera"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Golę się"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Biorę Kąpiel"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Biorę Prysznic"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Na_Spotkaniu"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Dzień_Wolny"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 #, fuzzy
 msgid "Hanging out"
 msgstr "wałęsam_się"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Wspinam Się"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "Na Wakacjach"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Bawię się"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Wakacje Zaplanowane"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Piję"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Odpoczywam"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Wspinam Się"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Gram"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Going out"
 msgstr "wychodzę"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Partying"
 msgstr "Bawię się"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Czytam"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Na próbie"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Na zakupach"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Na nartach"
+
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Socializing"
 msgstr "Udzielam się towarzysko"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Opalam się"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Oglądam TV"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Oglądam film."
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Rozmawiam"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "In Real Life"
 msgstr "zajmuję_się_życiem"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 #, fuzzy
 msgid "On the Phone"
 msgstr "rozmawiam przez telefon"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On Video Phone"
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 #, fuzzy
 msgid "Traveling"
 msgstr "w_podróży"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Commuting"
 msgstr "w_drodze_do_pracy(domu)"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 #, fuzzy
 msgid "Driving"
 msgstr "jeżdzę"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 #, fuzzy
 msgid "In a Car"
 msgstr "w_samochodzie"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 #, fuzzy
 msgid "On a Bus"
 msgstr "w_autobusie"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 #, fuzzy
 msgid "On a Plane"
 msgstr "w_samolocie"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "On a Train"
 msgstr "w_pociągu"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Trip"
 msgstr "w_podróży"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 #, fuzzy
 msgid "Walking"
 msgstr "rozmawiam"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 #, fuzzy
 msgid "Coding"
 msgstr "koduję"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "In a Meeting"
 msgstr "na_spotkaniu"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 #, fuzzy
 msgid "Studying"
 msgstr "Uczę się"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 #, fuzzy
 msgid "Writing"
 msgstr "piszę"
@@ -5528,7 +5697,7 @@ msgstr ""
 "anulowane."
 
 #. we're not english
-#: ../src/common/stanza_session.py:274
+#: ../src/common/stanza_session.py:278
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5620,40 +5789,40 @@ msgstr "Kontakt jest rozłączony. Twoja wiadomość nie mogła zostać wysłana
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:319
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:327
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: ../src/config.py:410
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:452
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Zawsze używaj domyślnych apikacji OS X"
 
-#: ../src/config.py:453
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Własne"
 
-#: ../src/config.py:643 ../src/dialogs.py:1191
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:644
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5662,253 +5831,253 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
 #. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1815 ../src/dialogs.py:1879
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
 #: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
-#: ../src/history_window.py:86
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1399
+#: ../src/config.py:1406
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
 "zalogować się ponownie."
 
-#: ../src/config.py:1524 ../src/config.py:1623
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1659 ../src/config.py:1702
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1660
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1686
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1687
+#: ../src/config.py:1694
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: ../src/config.py:1698
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1699
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1703
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1709
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1710
+#: ../src/config.py:1717
 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:1714 ../src/config.py:1718
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1715
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1719
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1793
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:1794
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:1812 ../src/config.py:1820 ../src/config.py:1863
-#: ../src/config.py:3090 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1821
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2011 ../src/config.py:3162
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2012 ../src/config.py:3163
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2033
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2034
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:2069
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2081
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2082
+#: ../src/config.py:2089
 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:2089 ../src/dialogs.py:1667 ../src/dialogs.py:1803
-#: ../src/dialogs.py:1983 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2097
 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:2094
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2126
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2127
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2310
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2312
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2348
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2349
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2351
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2400 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2442
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2444
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5916,11 +6085,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2446
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2447
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5928,11 +6097,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2450
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5940,11 +6109,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2452
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2453
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5952,7 +6121,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2454
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5968,46 +6137,46 @@ 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:2557
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2579 ../src/gajim.py:1414 ../src/roster_window.py:1932
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2580 ../src/roster_window.py:1906
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1933
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2590
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2591
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2687
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2687
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
@@ -6024,27 +6193,27 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
 
-#: ../src/config.py:3073
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3075
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3101
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Taki Jabber ID już istnieje!"
 
-#: ../src/config.py:3102
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Konto o takiej nazwie jest już skonfigurowane."
 
-#: ../src/config.py:3119
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3120 ../src/config.py:3309
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6053,26 +6222,26 @@ 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:3138
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:3139
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3190 ../src/gajim.py:1990
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3191 ../src/gajim.py:1991
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie "
 "dodany."
 
-#: ../src/config.py:3259
+#: ../src/config.py:3258
 #, fuzzy, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6087,7 +6256,7 @@ msgstr ""
 "Błąd SSL: %s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3265 ../src/gajim.py:2014
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6098,30 +6267,30 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3288 ../src/config.py:3327
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3308
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3412
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/conversation_textview.py:548
+#: ../src/conversation_textview.py:549
 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:567
+#: ../src/conversation_textview.py:568
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6130,51 +6299,56 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od "
 "momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę"
 
-#: ../src/conversation_textview.py:677
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:694
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:711
+#: ../src/conversation_textview.py:712
 #, 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:724
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:727
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:733
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: ../src/conversation_textview.py:1222
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "błąd przy wysyłaniu %s ( %s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1226
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1260
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -6207,144 +6381,144 @@ msgstr "Nazwa kontaktu: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Ustaw Nastrój"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 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:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:711
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s"
 
-#: ../src/dialogs.py:713
+#: ../src/dialogs.py:731
 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:870 ../src/dialogs.py:876 ../src/dialogs.py:881
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:877
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:900
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/dialogs.py:896
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:933
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1003
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1005
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035
 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:1030
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
 "Maciej Chojnacki <maciej@chojnacki.name>"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6356,89 +6530,89 @@ msgstr ""
 "inny język korzystać z opcji speller_langugage.\n"
 "Do tego czasu podświetlanie błędnie wpisanych słów nie będzie działało"
 
-#: ../src/dialogs.py:1596
+#: ../src/dialogs.py:1614
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:1599
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1660 ../src/gajim.py:2594
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:1686
 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:1687
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:1758
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1380
-#: ../src/groupchat_control.py:1656
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1763 ../src/dialogs.py:1769
-#: ../src/groupchat_control.py:1824
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:1764 ../src/dialogs.py:1770
-#: ../src/groupchat_control.py:1825
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:1777
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:1804
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:1818
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:1852
+#: ../src/dialogs.py:1870
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:1937
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6447,272 +6621,274 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1962 ../src/dialogs.py:2337 ../src/dialogs.py:2480
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:1963 ../src/dialogs.py:2338 ../src/dialogs.py:2481
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:1972 ../src/dialogs.py:1975
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:1975
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:1984
+#: ../src/dialogs.py:2001
 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:2003
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2003
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2007
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2008
+#: ../src/dialogs.py:2025
 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:2047 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2049 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:2051 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2051 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2052 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2052 ../src/gajim.py:1580 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2054 ../src/gajim.py:1646 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2056 ../src/gajim.py:1545 ../src/gajim.py:1613
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2058 ../src/gajim.py:1688 ../src/gajim.py:1710
-#: ../src/gajim.py:1727 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1691 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1435 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2063 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2258
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2260
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2286
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2381
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2382
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:2426
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:2428
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:2552
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2556
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2628
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Kolejność: %s, akcja: %s, typ: %s, wartość: %s"
 
-#: ../src/dialogs.py:2617
+#: ../src/dialogs.py:2633
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %s, akcja: %s"
 
-#: ../src/dialogs.py:2659
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:2746
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:2842
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:2844
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:2914
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:2915
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:2948
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:2951
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:2953
+#: ../src/dialogs.py:2968
 #, 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:2961
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3018
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3028 ../src/dialogs.py:3079
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:3066
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:3084
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:3149
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:3151
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3222
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:3346
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:3821
+#: ../src/dialogs.py:3836
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6720,39 +6896,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3825
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:3839
+#: ../src/dialogs.py:3854
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3844
+#: ../src/dialogs.py:3859
 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:3847
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:3869
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3866
+#: ../src/dialogs.py:3881
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś(aś) tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:3867
+#: ../src/dialogs.py:3882
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6762,10 +6938,31 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:3883
 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:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "Klucz kontaktu (%s) nie pasuje do klucza przypisanego w Gajimie."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
 #: ../src/disco.py:116
 msgid "Others"
 msgstr "Inni"
@@ -6922,7 +7119,7 @@ msgstr "Wymaga python-dbus"
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Funkcjonalność niedostępna dla systemu Windows."
 
@@ -7062,8 +7259,18 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
 
 #: ../src/features_window.py:101
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Wymaga texlive-latex-ase, dvips oraz imagemagick. Musisz ustawić zmienną "
+"'use_latex' na 'True'."
+
+#: ../src/features_window.py:102
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"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-ase, dvips oraz imagemagick. Musisz ustawić zmienną "
@@ -7125,139 +7332,139 @@ msgstr "Czas"
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Zapisz obraz jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7265,32 +7472,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Zatrzymaj"
 
@@ -7371,26 +7578,26 @@ msgstr ""
 "Wydaje się, że w tle działa już inna kopia Gajima.\n"
 "Czy mimo to chcesz uruchomić program?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Wpisz hasło GPG dla konta %s."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7401,50 +7608,50 @@ msgstr ""
 "innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: ../src/gajim.py:566
+#: ../src/gajim.py:576
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gajim.py:614 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/gajim.py:920 ../src/gajim.py:924
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:934 ../src/gajim.py:947
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %s ( %s )"
 
-#: ../src/gajim.py:979
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gajim.py:980
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
 
-#: ../src/gajim.py:999
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: ../src/gajim.py:1000
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7452,72 +7659,72 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:1220 ../src/groupchat_control.py:1092
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s występuje teraz jako %s"
 
-#: ../src/gajim.py:1235 ../src/groupchat_control.py:1266
-#: ../src/history_window.py:410 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1305
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1362 ../src/groupchat_control.py:1052
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
-#: ../src/gajim.py:1365
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1373
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: ../src/gajim.py:1415
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
 
-#: ../src/gajim.py:1449
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7525,20 +7732,20 @@ msgstr ""
 "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
 "lub zwraca błędne hasło.\n"
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gajim.py:1454
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gajim.py:1556
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7546,7 +7753,7 @@ msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
 msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
 msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
 
-#: ../src/gajim.py:1572
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7556,70 +7763,70 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1643
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gajim.py:1711
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Otrzymałeś plik %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1715
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: ../src/gajim.py:1728
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1732
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1825
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gajim.py:1895
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gajim.py:1896
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gajim.py:1908
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1921
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1932
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Błąd."
 
-#: ../src/gajim.py:1957
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gajim.py:1958
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7627,11 +7834,11 @@ msgstr ""
 "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
 "podać nowy zasób"
 
-#: ../src/gajim.py:2011
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gajim.py:2012
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7639,15 +7846,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2036
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7663,11 +7870,11 @@ msgstr ""
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gajim.py:2055 ../src/gajim.py:2085
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: ../src/gajim.py:2056
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7675,16 +7882,16 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś "
 "pewien?"
 
-#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: ../src/gajim.py:2059 ../src/gajim.py:2089 ../src/groupchat_control.py:1765
-#: ../src/roster_window.py:3778
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/gajim.py:2086
+#: ../src/gajim.py:2089
 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?"
@@ -7692,90 +7899,82 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gajim.py:2103
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: ../src/gajim.py:2104
+#: ../src/gajim.py:2107
 #, fuzzy, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Węzeł PEP %s nie został usunięty: %s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2552 ../src/gajim.py:2573
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gajim.py:2553
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2574
+#: ../src/gajim.py:2594
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2600 ../src/roster_window.py:3308
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2881
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: ../src/gajim.py:2978
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/gajim.py:2979
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/gajim.py:2992
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/gajim.py:2993
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
 
-#: ../src/gajim.py:3182
-msgid "Network Manager support not available"
-msgstr "Brak wsparcia dla Network Managera"
-
-#: ../src/gajim.py:3306
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7783,49 +7982,49 @@ msgstr ""
 "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
 "osobnej linii"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
 "zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "wiadomość"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7834,20 +8033,20 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7857,30 +8056,30 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 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:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7890,133 +8089,133 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Dodaje nowy kontakt do tego konta"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 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:232
+#: ../src/gajim-remote.py:231
 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:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowę'"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Rozpocznij rozmowę z tego konta"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8024,73 +8223,73 @@ 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:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsługuj URI xmpp:/"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 #, fuzzy
 msgid "Account in which you want to handle it"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "pokój"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 #, fuzzy
 msgid "Room JID"
 msgstr "Pokój:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "hasło"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Account from which you want to enter the room"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:326
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8099,31 +8298,31 @@ 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:329
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote.py:382
+#: ../src/gajim-remote.py:380
 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:411
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:419
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:423
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8132,7 +8331,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:496
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8141,7 +8340,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%s help %s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:501
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8150,7 +8349,7 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s help %s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Błędny adres URI"
 
@@ -8179,148 +8378,148 @@ 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:145
+#: ../src/groupchat_control.py:150
 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:147
+#: ../src/groupchat_control.py:152
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" opuścił go."
 
-#: ../src/groupchat_control.py:384
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:536
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:538
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/groupchat_control.py:956
+#: ../src/groupchat_control.py:1028
 #, 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."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1057
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1060
+#: ../src/groupchat_control.py:1132
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1070
+#: ../src/groupchat_control.py:1142
 #, 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:1077
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1081
+#: ../src/groupchat_control.py:1153
 #, 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:1090
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1128 ../src/groupchat_control.py:1132
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1129
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1280
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1284
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1299
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1303
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1264
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1655
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/groupchat_control.py:1403 ../src/groupchat_control.py:1421
-#: ../src/groupchat_control.py:1505 ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
 
-#: ../src/groupchat_control.py:1448
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
-#: ../src/groupchat_control.py:1578
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8332,14 +8531,14 @@ msgstr ""
 "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1585
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
 
-#: ../src/groupchat_control.py:1591
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8348,7 +8547,7 @@ msgstr ""
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_control.py:1597
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8357,7 +8556,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1601
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8366,7 +8565,7 @@ msgstr ""
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1605
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8376,7 +8575,7 @@ msgstr ""
 "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1614
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8385,61 +8584,61 @@ msgstr ""
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie."
 
-#: ../src/groupchat_control.py:1619
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#: ../src/groupchat_control.py:1623
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
 
-#: ../src/groupchat_control.py:1627
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
 
-#: ../src/groupchat_control.py:1630
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1839
 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:1798
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1803
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1804
+#: ../src/groupchat_control.py:1882
 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:1831
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1832
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8447,22 +8646,22 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1834
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2008
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:2009 ../src/groupchat_control.py:2312
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2311
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -8548,7 +8747,7 @@ msgstr "Kontakty"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
@@ -8559,7 +8758,7 @@ msgstr "Pseudonim"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Wiadomość"
 
@@ -8613,22 +8812,27 @@ msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
 msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: ../src/history_window.py:406
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Błąd zapisu na dysk"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:416
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:419
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
@@ -8665,42 +8869,42 @@ msgstr "- wiadomości będzie logowanych"
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
@@ -8713,18 +8917,18 @@ msgstr "Ogólne"
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2771
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2774
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2776 ../src/roster_window.py:2787
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
@@ -8756,40 +8960,40 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:954
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1882
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:1883
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1895
 #, 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:1909
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8797,15 +9001,15 @@ msgstr ""
 "Menedżer bazy kluczy GNOME jest zainstalowany, ale nie został prawidłowo "
 "uruchomiony\t\t\t\t\t\t\t\t(prawodpodobnie niepoprawna zmienna środowiskowa"
 
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:2107 ../src/roster_window.py:3251
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2108 ../src/roster_window.py:3252
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8813,15 +9017,15 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2134
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2269
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8829,16 +9033,16 @@ msgstr ""
 "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
 "włączoną obsługę historii."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8846,11 +9050,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8860,52 +9064,52 @@ msgstr ""
 "następujących transportów: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2652
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2660
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2717
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2718
+#: ../src/roster_window.py:2734
 #, 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:2719
+#: ../src/roster_window.py:2735
 #, fuzzy
 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:2758
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2759
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3128
 #, 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:3116
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8914,12 +9118,12 @@ msgstr ""
 "będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3121
+#: ../src/roster_window.py:3137
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/roster_window.py:3125
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8927,16 +9131,16 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3144
 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:3132
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3136
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8946,19 +9150,19 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3175
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3176
+#: ../src/roster_window.py:3192
 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:3692
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3694
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -8966,12 +9170,12 @@ msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:3772
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3774
+#: ../src/roster_window.py:3786
 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 "
@@ -8981,11 +9185,11 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: ../src/roster_window.py:3887
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:3898
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -8998,123 +9202,123 @@ msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4569 ../src/roster_window.py:4640
-#: ../src/roster_window.py:4649 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:4656
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4661
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4698 ../src/systray.py:257
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4718
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4758
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4820 ../src/roster_window.py:4929
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:4847
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:4854
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Nastrój"
 
-#: ../src/roster_window.py:4858
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Aktywność"
 
-#: ../src/roster_window.py:4863
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5017
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
 #. Send Group Message
-#: ../src/roster_window.py:5025 ../src/roster_window.py:5550
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5033
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5037
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: ../src/roster_window.py:5447
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5570
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
 #. Send single message
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: ../src/roster_window.py:5770
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5777
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
-#: ../src/roster_window.py:5857
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
 #. History manager
-#: ../src/roster_window.py:5970
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:5979
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:6189
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
@@ -9131,20 +9335,20 @@ msgstr "Błąd w odebranych danych"
 msgid "No result"
 msgstr "Brak wyników"
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:391 ../src/session.py:423
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:392
+#: ../src/session.py:400
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9160,7 +9364,7 @@ msgstr ""
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:424
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9175,19 +9379,19 @@ msgstr ""
 "\n"
 "Kontynuować?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Zasoby: "
 
@@ -9204,95 +9408,95 @@ msgstr " [zablokowany]"
 msgid " [minimized]"
 msgstr " [zminimalizowany]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Nastrój:"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Aktywność:"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Utwór"
 
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?status transferu:wstrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 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:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9300,25 +9504,25 @@ 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:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacje</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9326,7 +9530,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9334,12 +9538,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 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:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9347,20 +9551,62 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 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:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#~ msgid "Select the account with which to synchronise"
-#~ msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Szyfrowanie OpenPGP"
+
+#~ 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 "
+#~ "znakami: /say)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
+#~ "trzeciej osobie (np. /%s eksploduje.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "Szyfrowanie E2E włączone"
+
+#, 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"
@@ -9474,23 +9720,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "Tune"
 #~ msgstr "Muzyka"
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Szyfrowanie OpenPGP"
-
-#~ 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 "
-#~ "znakami: /say)"
-
-#, fuzzy
-#~ msgid "Encryption enabled"
-#~ msgstr "Szyfrowanie E2E włączone"
-
 #~ msgid ""
 #~ "\n"
 #~ "From: %(from_address)s"
diff --git a/po/pt.po b/po/pt.po
index cb5a98dce..c620ebdc7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,13 +1,12 @@
 # Portuguese translations for Gajim package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim package.
-# 
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -29,46 +28,53 @@ msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#, fuzzy
-msgid "Send Single _Message..."
-msgstr "Enviar _Mensagem Simples"
+#: ../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
-msgid "_Discover Services..."
-msgstr "_Descobrir Recursos..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "C_hat"
-
-#: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
+#, fuzzy
+msgid "_Modify Account"
 msgstr "_Modificar Conta..."
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:6
 #, 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -81,56 +87,82 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
-msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Clique para ver os serviços (tais como transportes MSN e ICQ) dos servidores "
 "jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Ligar quando eu premir Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, 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:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "_Senha:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Gerir..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 #, 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:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Usar hostname/porta personalizados"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -138,68 +170,64 @@ msgstr ""
 "Necessita de uma conta para se poder ligar\n"
 "à rede Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "O seu JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Host:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Nome do Host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#, fuzzy
-msgid "_Retype Password:"
-msgstr "_Senha:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Usar proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "Nome de _utilizador"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Detalhes Pessoais</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Conta"
 
@@ -208,19 +236,29 @@ msgid "Account Modification"
 msgstr "Modificação da Conta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Religar automaticamente em caso de perda de ligação."
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "_Administrador"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Religar automaticamente em caso de perda de ligação."
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Ligar ao arranque"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Mu_dar Senha"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -232,58 +270,77 @@ msgstr ""
 "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:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Escolha chave..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Ligação"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Geral"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome do Host:"
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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 ""
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive para evitar timeouts da "
 "ligação, os quais resultam na perda dessa ligação"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -292,7 +349,8 @@ 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:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -301,7 +359,8 @@ msgstr ""
 "Se marcado, o Gajim, quando iniciado, ligar-se-á automaticamente ao jabber "
 "usando esta conta"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -311,44 +370,49 @@ 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:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.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:24
-msgid "Manage..."
-msgstr "Gerir..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Nenhum"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -358,19 +422,23 @@ 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:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+#, fuzzy
+msgid "Resour_ce:"
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -384,88 +452,161 @@ 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:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar _frase de acesso (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "Usar hostname/porta personalizados"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "lista de transferências de ficheiros"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "_Nome: "
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Registos</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activar"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+#, 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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 tem duas ou mais contas e esta opção for marcada, o Gajim listará todos "
-"os contactos como se tivesse apenas uma conta"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nome:"
+
+#: ../data/glade/accounts_window.glade.h:35
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "_Fundir contas"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Re_nomear"
+
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Modificar"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+#, fuzzy
+msgid "Use custom port:"
+msgstr "Usar hostname/porta personalizados"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Remover"
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
@@ -487,7 +628,7 @@ msgstr "Gostaria de o adicionar à minha lista de contactos."
 
 #: ../data/glade/add_new_contact_window.glade.h:5
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -525,7 +666,7 @@ msgstr "ID do Utilizador:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
 #, fuzzy
-msgid "<b>An error has occured:</b>"
+msgid "<b>An error has occurred:</b>"
 msgstr "Ocorreu um erro de protocolo:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -568,11 +709,12 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
@@ -592,45 +734,46 @@ msgid "Deletes Message of the Day"
 msgstr "Apaga a Mensagem do Dia"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "Envia uma mensagem aos utilizadores ligados ao servidor neste momento"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Iniciar Conversa"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Definir MOTD"
+#, 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
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Definir MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Mostrar Consola _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Actualizar MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Actualiza a Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr ""
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "E_nviar Mensagem de Servidor"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "E_nviar Mensagem Simples"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
@@ -646,7 +789,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Sons</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
@@ -666,7 +809,7 @@ msgid "All statuses"
 msgstr "Estado: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Ausente"
 
@@ -684,7 +827,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -694,7 +837,7 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Indisponível"
 
@@ -715,125 +858,136 @@ msgstr "Tocar _Sons"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.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:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.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:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 #, fuzzy
 msgid "for "
 msgstr "Porta:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr ""
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Entry:"
 msgstr "País:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "nome do tema"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Nome:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Contacto:"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Configurar Mensagens de Estado</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:9
-msgid "You have received new entry:"
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
 msgstr ""
 
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Registos</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Registos</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Mudar Senha"
@@ -866,10 +1020,9 @@ msgid "Join _Group Chat"
 msgstr "_Entrar num Chat"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Adicionar à Lista"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -889,39 +1042,70 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Clique para ver conversas anteriores com este contacto"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Contacto:"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Ficheiro"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Activar/Desactivar Encriptação Open_PGP"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Activar/Desactivar Encriptação Open_PGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "Vista _Compacta    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Adicionar à Lista"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Histórico"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Invisível"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Servidor"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -935,6 +1119,24 @@ msgstr "Configuração da Sala"
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descrição</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Recursos dos Servidores"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
@@ -970,12 +1172,14 @@ msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de ficheiro da lista."
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, 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
-msgid "Shows a list of file transfers between you and other"
+#, 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"
 
@@ -993,7 +1197,7 @@ msgstr ""
 "Quando uma transferência de ficheiro é concluida, exibir um popup de "
 "notificação"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1001,7 +1205,7 @@ msgstr "_Continuar"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta"
 
@@ -1051,7 +1255,7 @@ msgstr "Personalização de Temas do Gajim"
 msgid "Gone"
 msgstr "Nenhum"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
@@ -1090,58 +1294,72 @@ msgid "_Background:"
 msgstr "Cor _de fundo"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Muda Alcu_nha"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Muda A_ssunto"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Clique para ver conversas anteriores nesta sala"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Configurar _Sala"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Configurar _Sala"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Adicionar esta Sala aos _Bookmarks"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "Acções de _Ocupantes"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "Acções de _Ocupantes"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Dono"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "E_nviar Mensagem Privada"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1149,107 +1367,106 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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:7
+#: ../data/glade/history_manager.glade.h:3
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr ""
+
+#: ../data/glade/history_manager.glade.h:4
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr ""
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 #, fuzzy
 msgid "_Search Database"
 msgstr "_Pesquisar"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Build custom query"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Query Builder..."
-
-#: ../data/glade/history_window.glade.h:4
-#, fuzzy
-msgid "Search"
-msgstr "_Pesquisar"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
+#, fuzzy
+msgid "Search:"
 msgstr "_Pesquisar"
 
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Negar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Convite Recebido"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Histórico das Conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Alcunha:"
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "Alcunha:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1269,19 +1486,38 @@ msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 msgid "Manage Bookmarks"
 msgstr "Gerir Bookmarks"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 #, fuzzy
 msgid "Print status:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Título:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Configuração da Sala"
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>Propriedades</b>"
@@ -1291,47 +1527,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Definições</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "Ligação HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Senha:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host:"
+
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Clique para inserir um emoticon (Alt+E)"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adiciona o contacto à lista"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "Encriptação OpenPGP"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Acções"
+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"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "E_nviar"
 
@@ -1347,42 +1621,78 @@ msgstr "<b>Editor de Configuração Avançada</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Aplicações</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Definições Personalizadas</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Formato de uma linha</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Formato de uma linha</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Mudanças na última versão</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
 #, fuzzy
-msgid "<b>GMail Options</b>"
-msgstr "<b>Aplicações</b>"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificações Visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Personalização da Interface</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Registos</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+#, fuzzy
+msgid "<b>GMail Options</b>"
+msgstr "<b>Aplicações</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notificações Visuais</b>"
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<b>Propriedades</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
 #, fuzzy
-msgid "A_fter nickname:"
-msgstr "Depois da alcunha:"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Propriedades</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notificações Visuais</b>"
+
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avançado"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1392,46 +1702,27 @@ msgstr ""
 "Apenas compondo uma mensagem\n"
 "Desactivado"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:25
 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:19
-msgid "Also known as iChat style"
-msgstr "Conhecido também como estilo iChat"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Marcar automaticamente como _ausente depois de:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Marcar automaticamente como _indisponível depois de:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Auto-detectar a cada arranque da aplicação\n"
@@ -1439,73 +1730,58 @@ msgstr ""
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../data/glade/preferences_window.glade.h:32
 #, fuzzy
-msgid "B_efore nickname:"
-msgstr "Antes da alcunha:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Conversa"
+msgid "Chat message:"
+msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"Marque esta opção apenas se alguem que não está na sua lista o estiver a "
-"spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
-"de qualquer contacto que não estiver na sua lista."
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
-#, fuzzy
-msgid "Default Status Messages"
-msgstr "Mensagem de Estado"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
-msgid "Default status _iconset:"
-msgstr "Iconset de _estados padrão:"
+msgid "Display _activity of contacts in roster"
+msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:42
 #, fuzzy
-msgid "Display a_vatars of contacts in roster"
+msgid "Display _tunes of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:37
-#, fuzzy
-msgid "Display status _messages of contacts in roster"
-msgstr "Exibir mensagens de estado dos contactos na lista"
-
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
-msgid "Displayed Chat state noti_fications:"
-msgstr "Noti_ficação do estado da conversa:"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
-msgid "E_very 5 minutes"
-msgstr "De 5 em 5 _minutos"
+msgid "Display m_ood of contacts in roster"
+msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
-msgid "Emoticons:"
-msgstr "Gerir Emoticons"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Eventos"
+msgid "Display status _messages of contacts in roster"
+msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1515,7 +1791,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:43
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1525,52 +1801,45 @@ 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:44
-#, fuzzy
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
-"Gajim will automatically show new events by poping up the relative window"
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
-"Gajim exibirá automaticamente a nova mensagem recebida numa nova janela de "
-"conversa ou numa aba numa janela existente"
+"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:45
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim o notificará a cada nova mensagem através de um popup no canto "
-"inferior direito do ecrã"
+msgid "Hide all buttons in chat windows"
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim o notificará através de um popup no canto inferior direito do ecrã "
-"sobre os contactos que se ligarem"
+"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:47
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
 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:48
+#: ../data/glade/preferences_window.glade.h:53
 #, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim mudará apenas o ícone do contacto que enviou a nova mensagem"
+"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:50
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
+"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:51
+#: ../data/glade/preferences_window.glade.h:55
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1579,7 +1848,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1588,260 +1857,301 @@ 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:53
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Se marcado, o Gajim lembrar-se-á da posição da janela principal na próxima "
-"vez que for executado"
+"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
+"lista"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Se marcado, o Gajim usará ícones de estado específicos a cada protocolo. "
-"(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
-"disponível, ausente, ocupado, etc...)"
+"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
+"lista"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
-"gráficos equivalentes."
+"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
+"lista"
 
-#: ../data/glade/preferences_window.glade.h:56
-msgid "Ignore rich content in incoming messages"
+#: ../data/glade/preferences_window.glade.h:60
+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:57
+#: ../data/glade/preferences_window.glade.h:61
 #, fuzzy
-msgid "Ma_nage..."
-msgstr "Gerir..."
-
-#: ../data/glade/preferences_window.glade.h:58
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
 msgstr ""
+"Marque esta opção apenas se alguem que não está na sua lista o estiver a "
+"spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
+"de qualquer contacto que não estiver na sua lista."
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "Notificar-me sobre contactos que acabem de se: "
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "Notify on new _GMail email"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "Em todas as _mensagens"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se marcado, o Gajim usará ícones de estado específicos a cada protocolo. "
+"(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
+"disponível, ausente, ocupado, etc...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-#, fuzzy
-msgid "One message _window:"
-msgstr "Enviar mensagem e fechar a janela"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
 #, fuzzy
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Noti_ficação do estado da conversa:"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
+"gráficos equivalentes."
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Play _sounds"
-msgstr "Tocar _Sons"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "Preferências"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Enviar mensagem e fechar a janela"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Mostrar hora:"
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Gerir..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr ""
-"Guardar _posição e tamanho das janelas de conversa e lista de contactos"
+#, fuzzy
+msgid "Notifications"
+msgstr "Modificação da Conta"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar-me sobre contactos que acabem de se: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Mostrar apenas na _lista"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar-me sobre contactos que acabem de se: "
 
 #: ../data/glade/preferences_window.glade.h:73
+msgid "Notify on new _GMail email"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Detalhes Pessoais..."
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "Tocar _Sons"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Preferências"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:82
 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:76
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Ordenar contactos por estados"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:85
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Iconset de _estados padrão:"
+
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "Interrompida"
+
+#: ../data/glade/preferences_window.glade.h:87
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "A mensagem de estado auto-ausente"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "A mensagem de estado auto-indisponível"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:82
-#, fuzzy
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
-
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Quando um novo evento (mensagem, pedido de transferência de ficheiro, "
-"etc...) é recebido, os métodos seguintes poderão ser usados para o informar. "
-"NOTA: Eventos de nova mensagem recebida só ocorrem se for uma nova mensagem "
-"de um contacto com quem ainda não estiver a conversar."
-
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
+msgid "When new event is received:"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
-msgid "_Advanced Notifications Control..."
-msgstr "Editor de Configuração Avançada"
+msgid "_Away after:"
+msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../data/glade/preferences_window.glade.h:87
-#, fuzzy
-msgid "_After time:"
-msgstr "Depois da hora:"
+#: ../data/glade/preferences_window.glade.h:94
+msgid "_Browser:"
+msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:95
 #, fuzzy
-msgid "_Before time:"
-msgstr "Antes da hora:"
+msgid "_Display chat state notifications:"
+msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:89
-msgid "_Browser:"
-msgstr "_Navegador:"
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Gerir Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:97
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:91
-#, fuzzy
-msgid "_Font:"
-msgstr "Letra:"
-
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:99
 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:94
+#: ../data/glade/preferences_window.glade.h:100
+msgid "_Ignore rich content in incoming messages"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Nunca"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Notificar-me"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensagem a enviar:"
 
-#: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "_Tocador de som:"
-
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "_Mostrar a mensagem como pop-up"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
 #, fuzzy
-msgid "_Sort contacts by status"
-msgstr "Ordenar contactos por estados"
+msgid "_Send chat state notifications:"
+msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "_Entrar num Chat"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Fora da lista"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutos"
 
@@ -1880,6 +2190,10 @@ msgstr ""
 msgid "Allow"
 msgstr ""
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Negar"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
@@ -1890,7 +2204,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr ""
 
@@ -1931,154 +2245,181 @@ msgstr "Pedir para ver o estado dele/dela"
 msgid "to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Formato de uma linha</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Sobre"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Definir _Avatar"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Endereço"
+#: ../data/glade/vcard_information_window.glade.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
 #, fuzzy
-msgid "Avatar:"
-msgstr "Definir _Avatar"
+msgid "<b>City:</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Aniversário"
+#: ../data/glade/vcard_information_window.glade.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:7
-msgid "City:"
-msgstr "Cidade:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Empresa:"
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "País:"
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "Família:"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Nome Dado:"
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "Página pessoal:"
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Formato de uma linha</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Definições Personalizadas</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Alcunha:"
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Nome do meio:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefone:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Mais"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, 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:31
+#: ../data/glade/vcard_information_window.glade.h:27
 #, fuzzy
-msgid "Personal Info"
-msgstr "Detalhes Pessoais..."
+msgid "<b>Prefix:</b>"
+msgstr "<b>Propriedades</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Registos</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefone:"
+#: ../data/glade/vcard_information_window.glade.h:30
+#, 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
-msgid "Position:"
-msgstr "Cargo:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Código Postal:"
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Definições</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Prefixo:"
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Função:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Sobre"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Estado:"
+msgid "Click to set your avatar"
+msgstr ""
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "Rua:"
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Sufixo:"
+#: ../data/glade/vcard_information_window.glade.h:47
+#, fuzzy
+msgid "Personal Info"
+msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Recuperar"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>O que pretende fazer?</b>"
@@ -2091,82 +2432,132 @@ msgstr "Remover conta _apenas do Gajim"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "_Remover"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 #, fuzzy
 msgid "A_sk to see his/her status"
 msgstr "Pedir para ver o estado dele/dela"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
-msgid "Add Special _Notification"
+msgid "Add Special _Notification..."
 msgstr "<b>Notificações Visuais</b>"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Atribuir chave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Editar _Grupos"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr ""
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar _Mensagem Simples"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Remover"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Pedir para ver o estado dele/dela"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+#, fuzzy
+msgid "Send Single _Message..."
+msgstr "Enviar _Mensagem Simples"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Enviar _Ficheiro"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Proibí-lo /-la de ver o meu estado"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Remover da Lista"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Contacto:"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renomear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Subscrição"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Continuar"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Contas"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Adicionar Contacto"
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Adicionar _Contacto"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Recursos dos Servidores"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2180,54 +2571,97 @@ msgstr "Questões Perguntadas Frequentemente (FAQ) (online)"
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Perfil, Avatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transportes"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Mostrar _Lista de Contactos"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Conteúdo"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Descobrir Recursos"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Acções"
+
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Conteúdo"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Enviar _Mensagem Simples"
+
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_View"
 msgstr "_Voz"
 
+#: ../data/glade/search_window.glade.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
+#, fuzzy
+msgid "Search"
+msgstr "_Pesquisar"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Adicionar _Contacto"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Informações do Contacto"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Pesquisar"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Ir"
@@ -2236,10 +2670,6 @@ msgstr "_Ir"
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtro:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registar para"
@@ -2298,11 +2728,15 @@ msgid "Au_thorize"
 msgstr "_Autorizar"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, 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
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, fuzzy
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr ""
 "Recusar autorização do contacto, para que ele não possa saber quando você "
 "está ligado"
@@ -2315,11 +2749,32 @@ msgstr "Pedido de Subscrição"
 msgid "_Deny"
 msgstr "_Negar"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.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
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
@@ -2332,59 +2787,75 @@ msgstr "Mostrar _Lista de Contactos"
 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:5
-msgid "Ask:"
-msgstr "Perguntar:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Cliente:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Recurso:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Definições</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrição</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Definições Personalizadas</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 #, fuzzy
 msgid "Comments"
 msgstr "Comentário: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Configurar _Sala"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contacto:"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Informações do Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "SO:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Recurso:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Estado:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Subscrição:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Mais"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Histórico das Conversas"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "_Escolher Avatar"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2394,11 +2865,6 @@ msgstr "<b>Tráfego Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2417,17 +2883,30 @@ msgstr "_Mensagem"
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
 #, fuzzy
-msgid "First Name:"
-msgstr "Nome:"
+msgid "Add Special _Notification"
+msgstr "<b>Notificações Visuais</b>"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-#, fuzzy
-msgid "Last Name:"
-msgstr "Nome:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Atribuir chave OpenPGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Editar _Grupos"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Modificar Conta..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2438,216 +2917,419 @@ msgstr ""
 msgid "Personal"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Recurso:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Estado:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 #, fuzzy
 msgid "Modify Account"
 msgstr "_Modificar Conta..."
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
+#: ../src/adhoc_commands.py:264
 #, fuzzy
-msgid "Use custom port:"
-msgstr "Usar hostname/porta personalizados"
+msgid "Cancel confirmation"
+msgstr "Informações do Contacto"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "Activo"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "Activo"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "Neste grupo"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr "Texto"
+
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
 
-#: ../src/advanced.py:57
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nome Preferencial"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Escondida"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+msgid "Belarusian"
+msgstr ""
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "German"
 msgstr "Geral"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Greek"
 msgstr "green"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+msgid "British"
+msgstr ""
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Croatian"
 msgstr "Morada"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Italian"
 msgstr "Itálico"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 #, fuzzy
 msgid "Polish"
 msgstr "_Publicar"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "Geral"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Se esta não for a língua para a qual quer destacar palavras mal soletradas,  "
-"ajuste, por favor, o seu $LANG como apropriado.  Por exemplo, para o "
-"francês, faça 'export LANG=fr_FR' ou 'export LANG=fr_FR.UTF-8' em ~/."
-"bash_profile ou, para o fazer globalmente, em /etc/profile.\n"
-"\n"
-"A função de destaque de palavras mal soletradas não será usada"
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:844
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 #, fuzzy
-msgid "Chats"
-msgstr "Conversa"
+msgid "GPG encryption enabled"
+msgstr "Encriptação activada"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1030
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#, fuzzy
+msgid "Unknown Artist"
+msgstr "Tipo desconhecido %s"
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#, fuzzy
+msgid "Unknown Title"
+msgstr "Tipo desconhecido %s"
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#, fuzzy
+msgid "Unknown Source"
+msgstr "Tipo desconhecido %s"
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+
+#: ../src/chat_control.py:1438
 #, 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."
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Encriptação desactivada"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Usar autenticação"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Usar autenticação"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
+#, python-format
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
+
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Comandos: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Uso: /%s, limpa a janela de texto."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, fuzzy, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s não emitiu uma chave OpenPGP nem você associou uma"
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "Encriptação activada"
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
+"pessoa. (Por exemplo, /%s explode.)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Uso: /%s, limpa a janela de texto."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Não há informações de ajuda para /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "Fora da lista"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Esta mensagem é encriptada]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1545
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2655,327 +3337,2865 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "a criar base de dados dos logs"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s é um ficheiro, mas deveria ser um directório"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim irá agora sair"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s é um directório, mas deveria ser um ficheiro"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "a criar directório %s"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Informações do Contacto"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Contacto Saiu"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Livre para conversar"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "_Continuar"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr ""
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Descrição"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Chat"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "Neste grupo"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Chat"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Já está na sala %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "Gajim - %d mensagem não lida"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Ausente por estar inactivo"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Indisponível por estar inactivo"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Apagar MOTD"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr ""
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr ""
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
+"(bold) mas * * não seja removido."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Adicionar * e [n] no título da lista de contactos?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
+"de conversa seja reaberta."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Número de minutos que as últimas linhas da conversa anterior devem durar."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
+"(Comportamento por defeito do cliente ICQ Mirabilis)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
+"ou 'WIKTIONARY', que significa que será usado o Wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:186
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:187
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr ""
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Mostrar aba quando apenas numa conversa?"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Mostrar borda da aba quando apenas numa conversa?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Mostrar botão de fechar na aba?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Noti_ficação do estado da conversa:"
+
+#: ../src/common/config.py:218
+#, fuzzy
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
+"num chat de vários utilizadores."
+
+#: ../src/common/config.py:219
+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 ""
+"Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
+"clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
+"não lidas. Dependendo do tema, este ícone poderá ser animado."
+
+#: ../src/common/config.py:222
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
+"cada contacto debaixo do nome de cada um deles na lista"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Se Verdadeiro (True), Gajim perguntará por um avatar a cada contacto que não "
+"tinha um da última vez ou tenha um na memória cache há demasiado tempo."
+
+#: ../src/common/config.py:229
+#, fuzzy
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Se Falso (False), deixará de ver a linha de estados em conversas quando um "
+"contacto mudar de estado ou de mensagem de estado."
+
+#: ../src/common/config.py:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr ""
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr ""
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+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"
+"'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."
+msgstr ""
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr ""
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr ""
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window"
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr ""
+
+#: ../src/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Enviar mensagem e fechar a janela"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
+"num chat de vários utilizadores."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/config.py:221
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Não é possível usar OpenPGP neste computador"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr ""
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "A dormir"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Volto logo"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Volto daqui a alguns minutos"
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "A comer"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Estou a comer, por isso deixe-me uma mensagem"
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Filme"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Estou a ver um filme."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "A trabalhar"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Estou a trabalhar"
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefone"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Estou ao telefone."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Estou fora"
+
+#: ../src/common/config.py:421
+#, fuzzy
+msgid "I'm out enjoying life."
+msgstr "Estou fora, fui apreciar a vida"
+
+#: ../src/common/config.py:425
+#, fuzzy
+msgid "I'm available."
+msgstr "Disponível"
+
+#: ../src/common/config.py:426
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Livre para conversar"
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr ""
+
+#: ../src/common/config.py:428
+#, fuzzy
+msgid "I'm not available."
+msgstr "Serviço não disponível"
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr ""
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr ""
+
+#: ../src/common/config.py:441
+#, fuzzy
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
+"muc_highlight_words, or quando uma mensagem conter a sua alcunha."
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr ""
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "green"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "grocery"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "human"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marine"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy
+msgid "Wrong host"
+msgstr "Frase de acesso"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Informação de registo para o transport %s não chegou a tempo"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+msgid "Invisibility not supported"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Alcunha não encontrada: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Está banido/a desta sala."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Tal sala não existe."
+
+#: ../src/common/connection_handlers.py:2060
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Criação de salas encontra-se restrita."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "A sua alcunha registada tem de ser usada."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Não está na lista de membros."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Autorização foi removida"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de o adicionar à minha lista"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "estamos agora subscritos a %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "pedido de remoção de subscrição por %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "já não estamos subscritos a %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, fuzzy, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
+"ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
+"org/ para o remover."
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Palavra-chave do OpenPGP não foi recebida"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "O utilizador será ligado a %s sem OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Ligação com conta \"%s\" foi perdida"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr ""
+
+#: ../src/common/connection.py:278
+#, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Versão D-Bus desconhecida: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Senha Inválida"
+
+#: ../src/common/connection.py:341
+#, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr ""
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Ligação"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Impossível ligar a \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Verifique a sua ligação ou tente novamente mais tarde."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Impossível ligar a \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Ligação com conta \"%s\" foi perdida"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Versão D-Bus desconhecida: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Verifique a sua ligação ou tente novamente mais tarde"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Falha na autenticação com \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Por favor, verifique se o seu login e senha estão correctos."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "erro ao enviar"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Esta mensagem é encriptada]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Assunto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr ""
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#, fuzzy
+msgid "Observers"
+msgstr "Servidor"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "Fora da lista"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Bindings do python D-Bus estão em falta neste computador"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Nome da conta não pode ser vazio"
+
+#: ../src/common/exceptions.py:55
+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
+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
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Nenhum"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Rua:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Porta:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "Ficheiro"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Continuar"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Apagar MOTD"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr ""
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "Registar para %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:64
+#, fuzzy
+msgid "Morning"
+msgstr "A trabalhar"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Noon"
+msgstr "Nenhum"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Evening"
+msgstr "Evento"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr ""
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Caractere inválido no nome de utilizador"
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Endereço de servidor necessário."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Caractere inválido no hostname."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Caractere inválido no recurso."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Todos os %s _minutos"
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Ocupado"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Ocupado"
 
-#: ../src/config.py:363
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Indisponível"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Livre para conversar"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Livre para conversar"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Disponível"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Disponível"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Ligando"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "A_usente"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Offline"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Offline"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "In_visível"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "Desconhecido"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "Contém erros"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "Nenhuma"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Para"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Ambos"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "Nenhum"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Subscrição"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderadores"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderador"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Participantes"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Participante"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Visitantes"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Visitante"
+
+#: ../src/common/helpers.py:358
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: ../src/common/helpers.py:360
+#, fuzzy
+msgid "Owner"
+msgstr "_Dono"
+
+#: ../src/common/helpers.py:362
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administrador"
+
+#: ../src/common/helpers.py:364
+#, fuzzy
+msgid "Member"
+msgstr "_Membro"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "está a prestar atenção à conversa"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "está a fazer outra coisa qualquer"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "está a escrever uma mensagem..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "pausa na composição da mensagem"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "fechou a janela de conversa ou aba"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Enviar mensagem"
+msgstr[1] "Enviar mensagem"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "De %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "erro: impossível abrir %s para leitura"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "a criar base de dados dos logs"
+
+#: ../src/common/passwords.py:92
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "para conta %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pausada"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Negrito"
+
+#: ../src/common/pep.py:38
+msgid "Brave"
+msgstr ""
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Conversa"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Negrito"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Conteúdo"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Completa"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Conteúdo"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Activo"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Apagar MOTD"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+msgid "Disappointed"
+msgstr ""
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+msgid "Dismayed"
+msgstr ""
+
+#: ../src/common/pep.py:55
+msgid "Distracted"
+msgstr ""
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "mensagem"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Invisível"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "Nenhum"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Geral"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Modificar"
+
+#: ../src/common/pep.py:85
+#, fuzzy
+msgid "Nervous"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "Apagar MOTD"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Interrompida"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Nome:"
+
+#: ../src/common/pep.py:98
+#, fuzzy
+msgid "Serious"
+msgstr "_Anterior"
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "_Expulsar"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "A dormir"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Rua:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Subscrição"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tempo"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Sublinhar"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Frase de acesso"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Evento"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "Neste grupo"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Evento"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Expulsando %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Entrar"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "A comer"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Mudar Assunto"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Expulsando %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "A comer"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "simples"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Expulsando %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "A comer"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Desligar"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "A comer"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "A comer"
+
+#: ../src/common/pep.py:167
+msgid "Rehearsing"
+msgstr ""
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "A dormir"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "A comer"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Estou a ver um filme."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "A comer"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Estou ao telefone."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "A transferir"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Ligando"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+msgid "On a Train"
+msgstr ""
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "A trabalhar"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Ligação"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "A trabalhar"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, fuzzy, python-format
+msgid "Unable to bind to port %s."
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Para continuar a enviar e receber mensagens, precisará de se reconectar."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossível entrar na sala"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr ""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Impossível ligar a \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Esta mensagem é encriptada]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "erro ao enviar"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr ""
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Mensagem de Estado"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Activar"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Definições Personalizadas</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, 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:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1074
+#: ../src/config.py:1054
 #, fuzzy
-msgid "Next Message Received"
+msgid "Next Message Received Focused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Nova Mensagem"
+
+#: ../src/config.py:1057
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1693
+#, fuzzy, python-format
+msgid "You have opened chat in account %s"
+msgstr "Não tem nenhuma conta activa"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr ""
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 #, 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:1344
+#: ../src/config.py:1716
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Gerir Contas"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Introduza a chave GPG para a conta %s"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr ""
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr ""
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1566
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
+#: ../src/config.py:2076
+#, fuzzy
+msgid "OpenPGP Key Selection"
+msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Escolha sua chave OpenPGP"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 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:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 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:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 #, 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:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Erro ao receber as chaves secretas"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
-
-#: ../src/config.py:1634 ../src/config.py:3427
-#, fuzzy
-msgid "OpenPGP Key Selection"
-msgstr "Encriptação OpenPGP"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Escolha sua chave OpenPGP"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Servidor"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr ""
-
-#: ../src/config.py:1969
-#, fuzzy, python-format
-msgid "You have opened chat in account %s"
-msgstr "Não tem nenhuma conta activa"
-
-#: ../src/config.py:1970
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr ""
-
-#: ../src/config.py:2029
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
 #, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2985,382 +6205,497 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Mostrar hora:"
+
+#: ../src/config.py:2758
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2749
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, verifique se preencheu os campos servidor e sala ou remova este "
 "bookmark"
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "Senha Inválida"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "As senhas não conferem"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 msgstr ""
 "Pode ajustar opções de conta avançadas clicando no botão Avançadas, ou mais "
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3100
-msgid "Your new account has been created successfully"
-msgstr "A sua nova conta foi criada com sucesso"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Por favor, especifique a nova alcunha a usar:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Contacto já se encontra na lista"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "A sua nova conta foi criada com sucesso"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 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:342
+#: ../src/conversation_textview.py:678
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Cliente de IM Jabber"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Definir MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Mensagem de Estado"
+
+#: ../src/dialogs.py:673
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+
+#: ../src/dialogs.py:682
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor preencha os dados do contacto que deseja adicionar na conta %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 #, 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:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Eu gostaria de o adicionar à minha lista"
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:906
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossível entrar na sala"
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, 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:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 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:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, 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:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Tem de estar ligado para poder mudar a sua senha."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Servidor"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Conta \"%s\" está ligada ao servidor"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Não pode entrar num chat sem estar ligado."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3370,279 +6705,386 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Senha Inválida"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "As senhas não conferem"
+
+#: ../src/dialogs.py:2025
+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:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1887
+#: ../src/dialogs.py:2628
 #, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2633
 #, fuzzy, python-format
-msgid "Order: %s, action: %s"
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Está banido/a desta sala."
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
+
+#: ../src/dialogs.py:2968
 #, fuzzy, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr ""
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Outros"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "Transportes"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3650,208 +7092,469 @@ 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:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 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:728
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/disco.py:754
 #, fuzzy, python-format
-msgid "Browsing %s using account %s"
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 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:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "comando"
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+msgid "Node"
+msgstr "Nó"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "_Histórico"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Mensagem"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+msgid "Idle"
+msgstr ""
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "Encriptação OpenPGP"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "Mensagem recebida:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Geral"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Recursos dos Servidores"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "Transferência de ficheiro cancelada"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "Transferência de ficheiro parada pelo contacto na outra ponta"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Descrição: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Guardar Ficheiro como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3859,62 +7562,72 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Falta suporte libglade para o runtime GTK+"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3923,7 +7636,7 @@ msgstr ""
 "Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
 "de %s"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -3931,16 +7644,16 @@ msgstr ""
 "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3948,227 +7661,459 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorização para %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Frase de acesso Necessária"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Introduza a chave GPG para a conta %s"
+
+#. ask again
+#: ../src/gajim.py:509
+#, fuzzy
+msgid "Wrong Passphrase"
+msgstr "Frase de acesso"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
+"Por favor, introduza outra alcunha em baixo:"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Aceita este pedido?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Autorização para %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gajim.py:706
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Assunto: %s\n"
+msgid "Error %(code)s: %(msg)s"
+msgstr "Introduza a sua mensagem :"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, fuzzy, python-format
-msgid "error while sending %s ( %s )"
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "Vê-lo-á sempre como estando offline."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "Verifique a sua ligação ou tente novamente mais tarde."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s agora é conhecido como %s"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s está agora  %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "A sua chave de acesso está incorrecta"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "É necessária uma palavra-passe para esta sala."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "A sua chave de acesso está incorrecta"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Em todas as _mensagens"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+#, fuzzy
+msgid "Error."
+msgstr "Erro:"
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Recurso: "
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Ligação"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+#, fuzzy
+msgid "Do _not ask me again"
+msgstr "_Não voltar a perguntar"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Encriptação desactivada"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Não pode entrar numa sala quando está invisível"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:2090
-#, fuzzy
-msgid "Network Manager support not available"
-msgstr "Uma ligação não está disponível"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bookmark já está configurado"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
+#: ../src/gajim.py:2998
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Sala \"%s\" já existe nos seus bookmarks."
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
+
+#: ../src/gajim-remote.py:79
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 #, fuzzy
-msgid "Popups a window with the next pending event"
+msgid "Pops up a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4177,21 +8122,21 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostra uma caixa de conversa para que possa enviar mensagens a um contacto"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4202,27 +8147,29 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -4233,110 +8180,119 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID do destinatário da mensagem"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Adiciona um novo contacto nesta conta."
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:231
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -4344,40 +8300,104 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:238
 #, fuzzy
-msgid "Returns number of unreaded messages"
+msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Juntar-se a uma Nova Sala"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Sala:"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "_Expulsar"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "Senha:"
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "As senhas não conferem"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+msgid "Check if Gajim is running"
+msgstr ""
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Mostra ou esconde a janela principal"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4386,29 +8406,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:335
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
+#, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uso: %s %s %s \n"
-"\t"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4417,148 +8439,203 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:420
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
+"Argumento \"%s\" não está especificado. \n"
+"Escreva \"%s help %s\" para mais informações"
+
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Frase de acesso"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Não pode apagar o seu tema actual"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Não pode apagar o seu tema actual"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chat"
-msgstr "Iniciar Conversa"
-
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chats"
-msgstr "Iniciar Conversa"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:152
 #, fuzzy, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+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:144
-msgid "Group Chat"
-msgstr "Chat"
+#: ../src/groupchat_control.py:451
+#, fuzzy
+msgid "Insert Nickname"
+msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:144
+#: ../src/groupchat_control.py:603
 #, fuzzy
-msgid "Group Chats"
-msgstr "Chat"
+msgid "Conversation with "
+msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:605
 #, fuzzy
-msgid "Insert Nickname"
-msgstr "Muda Alcu_nha"
+msgid "Continued conversation"
+msgstr "Ligação"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "A sua nova conta foi criada com sucesso"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, 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:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Filiação: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s agora é conhecido como %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:936
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s foi expulso: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s está agora %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Nome de utilizador inválido"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s não parece ser um JID válido"
-
-#: ../src/groupchat_control.py:1227
-#, fuzzy, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Comando inexistente: /%s (se desejar enviar isto, escreva primeiro /say)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4570,20 +8647,16 @@ msgstr ""
 "pode ser substituida, mas não se conter \"@\". Se o JID estiver neste "
 "momento na sala, este será também expulso. Não suporta espaços numa alcunha."
 
-#: ../src/groupchat_control.py:1259
-#, python-format
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, limpa a janela de texto."
-
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4592,12 +8665,7 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1268
-#, fuzzy, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, limpa a janela de texto."
-
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4606,7 +8674,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4615,7 +8683,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4625,121 +8693,101 @@ msgstr ""
 "Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha da "
 "sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
 
-#: ../src/groupchat_control.py:1284
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
-"pessoa. (Por exemplo, /%s explode.)"
-
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1692
 #, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Uso: /%s <alcunha> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante da sala especificado pela alcunha."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <message>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "Não há informações de ajuda para /%s"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, 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:1358
+#: ../src/groupchat_control.py:1839
 #, 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:1362 ../src/roster_window.py:3962
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "_Não voltar a perguntar"
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "Bookmark já está configurado"
-
-#: ../src/groupchat_control.py:1433
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Sala \"%s\" já existe nos seus bookmarks."
+msgid "Destroying %s"
+msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark foi adicionado com sucesso"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-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/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Um erro de programação foi detectado"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4747,85 +8795,100 @@ msgstr ""
 "Provavelmente não se trata de um erro fatal, mas, ainda assim, os "
 "programadores deveriam ser informados."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Reportar Erro (Bug)"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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"
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+#, fuzzy
+msgid "Gajim is not the default Jabber client"
+msgstr "Gajim - Um cliente Jabber GTK+"
+
+#: ../src/gtkgui_helpers.py:734
+#, fuzzy
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Deseja sobre-escrevê-lo?"
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:738
+#: ../src/gtkgui_helpers.py:844
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 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 "
@@ -4834,143 +8897,182 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Erro:"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está agora %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+msgid "Timeout loading image"
+msgstr ""
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "Imagem é muito grande"
+
+#: ../src/message_window.py:446
+#, fuzzy
+msgid "Chats"
+msgstr "Conversa"
+
+#: ../src/message_window.py:448
+#, fuzzy
+msgid "Group Chats"
+msgstr "Chat"
+
+#: ../src/message_window.py:450
+#, fuzzy
+msgid "Private Chats"
+msgstr "Iniciar Conversa"
+
+#: ../src/message_window.py:456
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/message_window.py:274
-#, fuzzy, python-format
-msgid "%s - Gajim"
-msgstr "Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova Mensagem como %s"
+
+#: ../src/notify.py:279
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Geral"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr ""
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Localização do ficheiro"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Tal sala não existe."
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "É necessária uma ligação para poder publicar as suas informações de contacto."
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr ""
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4978,225 +9080,157 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "É necessária uma ligação para receber as suas informações de contacto."
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-#, fuzzy
-msgid "Observers"
-msgstr "Servidor"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Não pode entrar numa sala quando está invisível"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Autorização foi enviada"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "usando a conta %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Agora \"%s\" saberá o seu estado."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Pedido de subscrição foi enviado"
+
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "to %s account"
-msgstr "para conta %s"
+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."
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Autorização foi removida"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "using %s account"
-msgstr "usando conta %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#. profile, avatar
-#: ../src/roster_window.py:983
-#, fuzzy, python-format
-msgid "of account %s"
-msgstr "para conta %s"
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1003
-#, fuzzy
-msgid "_Manage Bookmarks..."
-msgstr "Gerir Bookmarks..."
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "para conta %s"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Está a participar num ou mais chats"
 
-#. History manager
-#: ../src/roster_window.py:1053
-#, fuzzy
-msgid "History Manager"
-msgstr "_Histórico"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:1062
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "_Entrar num Chat"
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1393
+#: ../src/roster_window.py:2534
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:2676
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:2733
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:1478
+#: ../src/roster_window.py:2735
 #, fuzzy
-msgid "Remove also all contacts in this group from your roster"
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-#, fuzzy
-msgid "_New group chat"
-msgstr "Chat"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "Eu gostaria de o adicionar à minha lista"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-#, fuzzy
-msgid "Send Group M_essage"
-msgstr "Nova Mensagem"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "Re_nomear"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr ""
-
-#: ../src/roster_window.py:2061
-#, fuzzy
-msgid "To all online users"
-msgstr "Utilizadores _Online"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "_Ligar"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "_Desligar"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "_Mudar Mensagem de Estado"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "Autorização foi enviada"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Agora \"%s\" saberá o seu estado."
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "Pedido de subscrição foi enviado"
-
-#: ../src/roster_window.py:2394
-#, 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:2406
-msgid "Authorization has been removed"
-msgstr "Autorização foi removida"
-
-#: ../src/roster_window.py:2407
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
-
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3132
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -5205,7 +9239,13 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5213,17 +9253,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:3144
 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:2631
+#: ../src/roster_window.py:3148
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5232,196 +9272,358 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "O utilizador será ligado a %s sem OpenPGP."
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "Frase de acesso Necessária"
-
-#: ../src/roster_window.py:2711
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Introduza a chave GPG para a conta %s"
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Guardar frase de acesso"
-
-#: ../src/roster_window.py:2724
-#, fuzzy
-msgid "Wrong Passphrase"
-msgstr "Frase de acesso"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr ""
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-msgid "You are participating in one or more group chats"
-msgstr "Está a participar num ou mais chats"
-
-#: ../src/roster_window.py:2783 ../src/roster_window.py:2843
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 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:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr ""
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3956
+#: ../src/roster_window.py:3784
 #, 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:3958
+#: ../src/roster_window.py:3786
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"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:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Ficheiro Inválido"
+
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
-msgid "Drop %s in group %s"
-msgstr "De %s na sala %s"
+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:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "usando a conta %s"
 
-#: ../src/roster_window.py:4132
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "para conta %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "usando conta %s"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+#, fuzzy
+msgid "_Manage Bookmarks..."
+msgstr "Gerir Bookmarks..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
 #, fuzzy, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Envia um ficheiro a um contacto"
+msgid "of account %s"
+msgstr "para conta %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "para conta %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Mudar Mensagem de Estado"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publicar"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Activo"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Descobrir Recursos..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Nova Mensagem"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr ""
+
+#: ../src/roster_window.py:5055
+#, fuzzy
+msgid "To all online users"
+msgstr "Utilizadores _Online"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Eu gostaria de o adicionar à minha lista"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Contacto:"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "E_nviar Mensagem Simples"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportes"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Transportes"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contacto Entrou"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Chat"
+
+#. History manager
+#: ../src/roster_window.py:5988
+#, fuzzy
+msgid "History Manager"
+msgstr "_Histórico"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:4319
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Assunto: %s\n"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Versão %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Ligação"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Contacto Entrou"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Sala:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Activo"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipo:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 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:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5429,25 +9631,25 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:311
 #, fuzzy
-msgid "Affiliation:"
-msgstr "Filiação: "
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Aplicações</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5455,7 +9657,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:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5463,1280 +9665,402 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 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:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " recurso com prioridade "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "a criar base de dados dos logs"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "%s é um ficheiro, mas deveria ser um directório"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim irá agora sair"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "%s é um directório, mas deveria ser um ficheiro"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "a criar directório %s"
-
-#: ../src/common/config.py:55
-#, fuzzy
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "Ausente por estar inactivo"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "Indisponível por estar inactivo"
-
-#: ../src/common/config.py:82
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr ""
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr ""
-
-#: ../src/common/config.py:96
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
-"(bold) mas * * não seja removido."
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Adicionar * e [n] no título da lista de contactos?"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
-"de conversa seja reaberta."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Número de minutos que as últimas linhas da conversa anterior devem durar."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
-"(Comportamento por defeito do cliente ICQ Mirabilis)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
-"ou 'WIKTIONARY', que significa que será usado o Wiktionary."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
-
-#: ../src/common/config.py:154
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " recurso com prioridade "
 
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Encriptação OpenPGP"
 
-#: ../src/common/config.py:160
 #, fuzzy
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s não emitiu uma chave OpenPGP nem você associou uma"
 
-#: ../src/common/config.py:161
 #, fuzzy
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr ""
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Mostrar aba quando apenas numa conversa?"
-
-#: ../src/common/config.py:175
-#, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Mostrar borda da aba quando apenas numa conversa?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Mostrar botão de fechar na aba?"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Comando inexistente: /%s (se desejar enviar isto, escreva primeiro /say)"
 
-#: ../src/common/config.py:189
 #, fuzzy
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-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:190
-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 ""
-"Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
-"clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
+#~ "pessoa. (Por exemplo, /%s explode.)"
 
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
-"não lidas. Dependendo do tema, este ícone poderá ser animado."
+#~ msgid "Encryption enabled"
+#~ msgstr "Encriptação activada"
 
-#: ../src/common/config.py:193
-#, fuzzy
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
-"cada contacto debaixo do nome de cada um deles na lista"
+#~ msgid "Encryption disabled"
+#~ msgstr "Encriptação desactivada"
 
-#: ../src/common/config.py:195
-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 ""
-"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."
+#~ msgid "<b>Please fill in the data for your new account</b>"
+#~ msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: ../src/common/config.py:196
 #, fuzzy
-msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or his or her status message."
-msgstr ""
-"Se Falso (False), deixará de ver a linha de estados em conversas quando um "
-"contacto mudar de estado ou de mensagem de estado."
+#~ msgid "_Retype Password:"
+#~ msgstr "_Senha:"
 
-#: ../src/common/config.py:197
-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 ""
+#~ msgid "_Use proxy"
+#~ msgstr "_Usar proxy"
 
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr ""
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Se tem duas ou mais contas e esta opção for marcada, o Gajim listará "
+#~ "todos os contactos como se tivesse apenas uma conta"
 
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr ""
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Clique para ver conversas anteriores com este contacto"
 
-#: ../src/common/config.py:202
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "Vista _Compacta    Alt+C"
 
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr ""
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Clique para ver conversas anteriores nesta sala"
 
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr ""
+#~ msgid "Build custom query"
+#~ msgstr "Build custom query"
 
-#: ../src/common/config.py:205
-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 ""
+#~ msgid "Query Builder..."
+#~ msgstr "Query Builder..."
 
-#: ../src/common/config.py:207
-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 ""
+#~ msgid "Accept"
+#~ msgstr "Aceitar"
 
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
+#~ msgid "Invitation Received"
+#~ msgstr "Convite Recebido"
 
-#: ../src/common/config.py:211
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr ""
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/common/config.py:212
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr ""
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Personalização da Interface</b>"
 
-#: ../src/common/config.py:213
 #, fuzzy
-msgid "Hides the buttons in group chat window."
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
+#~ msgid "A_fter nickname:"
+#~ msgstr "Depois da alcunha:"
 
-#: ../src/common/config.py:214
-#, fuzzy
-msgid "Hides the buttons in two persons chat window."
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
+#~ msgid "Also known as iChat style"
+#~ msgstr "Conhecido também como estilo iChat"
 
-#: ../src/common/config.py:215
 #, fuzzy
-msgid "Hides the banner in a group chat window"
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
+#~ msgid "B_efore nickname:"
+#~ msgstr "Antes da alcunha:"
 
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr ""
+#~ msgid "Chat"
+#~ msgstr "Conversa"
 
-#: ../src/common/config.py:217
 #, 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:218
-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:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr ""
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-
-#: ../src/common/config.py:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr ""
-
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-
-#: ../src/common/config.py:326
-#, fuzzy
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "Não é possível usar OpenPGP neste computador"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-msgid "Language for which we want to check misspelled words"
-msgstr ""
-
-#: ../src/common/config.py:336
-msgid "all or space separated status"
-msgstr ""
-
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr ""
-
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr ""
-
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "A dormir"
-
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "Volto logo"
-
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "Volto daqui a alguns minutos"
-
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "A comer"
-
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "Estou a comer, por isso deixe-me uma mensagem"
-
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "Filme"
-
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "Estou a ver um filme."
-
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "A trabalhar"
-
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "Estou a trabalhar"
-
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "Telefone"
-
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "Estou ao telefone."
+#~ msgid "E_very 5 minutes"
+#~ msgstr "De 5 em 5 _minutos"
 
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "Estou fora"
+#~ msgid "Events"
+#~ msgstr "Eventos"
 
-#: ../src/common/config.py:357
 #, fuzzy
-msgid "I'm out enjoying life."
-msgstr "Estou fora, fui apreciar a vida"
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr ""
+#~ "Gajim exibirá automaticamente a nova mensagem recebida numa nova janela "
+#~ "de conversa ou numa aba numa janela existente"
 
-#: ../src/common/config.py:361
 #, fuzzy
-msgid "I'm available."
-msgstr "Disponível"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim o notificará a cada nova mensagem através de um popup no canto "
+#~ "inferior direito do ecrã"
 
-#: ../src/common/config.py:362
-#, fuzzy
-msgid "I'm free for chat."
-msgstr "Livre para conversar"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim o notificará através de um popup no canto inferior direito do ecrã "
+#~ "sobre os contactos que se ligarem"
 
-#: ../src/common/config.py:364
 #, fuzzy
-msgid "I'm not available."
-msgstr "Serviço não disponível"
-
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr ""
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim mudará apenas o ícone do contacto que enviou a nova mensagem"
 
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr ""
+#~ 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 ""
+#~ "Se marcado, o Gajim lembrar-se-á da posição da janela principal na "
+#~ "próxima vez que for executado"
 
-#: ../src/common/config.py:376
 #, fuzzy
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
-msgstr ""
-"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."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Noti_ficação do estado da conversa:"
 
-#: ../src/common/config.py:377
-msgid "Sound to play when any MUC message arrives."
-msgstr ""
+#~ msgid "Print time:"
+#~ msgstr "Mostrar hora:"
 
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "green"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Guardar _posição e tamanho das janelas de conversa e lista de contactos"
 
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr "grocery"
+#~ msgid "Show only in _roster"
+#~ msgstr "Mostrar apenas na _lista"
 
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "human"
+#~ msgid "The auto away status message"
+#~ msgstr "A mensagem de estado auto-ausente"
 
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "marine"
+#~ msgid "The auto not available status message"
+#~ msgstr "A mensagem de estado auto-indisponível"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossível entrar na sala"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-#, fuzzy
-msgid "Wrong host"
-msgstr "Frase de acesso"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: ../src/common/connection_handlers.py:590
-#, 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:1523
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alcunha não encontrada: %s"
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
 #, fuzzy
-msgid "Unable to join group chat"
-msgstr "Impossível entrar na sala"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Quando um novo evento (mensagem, pedido de transferência de ficheiro, "
+#~ "etc...) é recebido, os métodos seguintes poderão ser usados para o "
+#~ "informar. NOTA: Eventos de nova mensagem recebida só ocorrem se for uma "
+#~ "nova mensagem de um contacto com quem ainda não estiver a conversar."
 
-#: ../src/common/connection_handlers.py:1586
 #, fuzzy
-msgid "A password is required to join this group chat."
-msgstr "É necessária uma palavra-passe para esta sala."
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Editor de Configuração Avançada"
 
-#: ../src/common/connection_handlers.py:1589
 #, fuzzy
-msgid "You are banned from this group chat."
-msgstr "Está banido/a desta sala."
+#~ msgid "_After time:"
+#~ msgstr "Depois da hora:"
 
-#: ../src/common/connection_handlers.py:1592
 #, fuzzy
-msgid "Such group chat does not exist."
-msgstr "Tal sala não existe."
+#~ msgid "_Before time:"
+#~ msgstr "Antes da hora:"
 
-#: ../src/common/connection_handlers.py:1595
 #, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "Criação de salas encontra-se restrita."
+#~ msgid "_Font:"
+#~ msgstr "Letra:"
 
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "A sua alcunha registada tem de ser usada."
+#~ msgid "_Never"
+#~ msgstr "_Nunca"
 
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "Não está na lista de membros."
+#~ msgid "_Notify me about it"
+#~ msgstr "_Notificar-me"
 
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
-"Por favor, introduza outra alcunha em baixo:"
+#~ msgid "_Player:"
+#~ msgstr "_Tocador de som:"
 
-#: ../src/common/connection_handlers.py:1659
-msgid "I would like to add you to my roster."
-msgstr "Eu gostaria de o adicionar à minha lista"
+#~ msgid "_Pop it up"
+#~ msgstr "_Mostrar a mensagem como pop-up"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos agora subscritos a %s"
+#~ msgid "Address"
+#~ msgstr "Endereço"
 
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "pedido de remoção de subscrição por %s"
+#~ msgid "City:"
+#~ msgstr "Cidade:"
 
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "já não estamos subscritos a %s"
+#~ msgid "Company:"
+#~ msgstr "Empresa:"
 
-#: ../src/common/connection_handlers.py:1854
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
-"ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
-"org/ para o remover."
+#~ msgid "Country:"
+#~ msgstr "País:"
 
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Ligação com conta \"%s\" foi perdida"
+#~ msgid "Given:"
+#~ msgstr "Nome Dado:"
 
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr ""
+#~ msgid "Middle:"
+#~ msgstr "Nome do meio:"
 
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
+#~ msgid "Position:"
+#~ msgstr "Cargo:"
 
-#. wrong answer
-#: ../src/common/connection.py:213
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Senha Inválida"
+#~ msgid "Prefix:"
+#~ msgstr "Prefixo:"
 
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Impossível ligar a \"%s\""
+#~ msgid "Role:"
+#~ msgstr "Função:"
 
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Ligado ao servidor %s:%s com %s"
+#~ msgid "State:"
+#~ msgstr "Estado:"
 
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "Verifique a sua ligação ou tente novamente mais tarde"
+#~ msgid "Suffix:"
+#~ msgstr "Sufixo:"
 
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Falha na autenticação com \"%s\""
+#~ msgid "_Retrieve"
+#~ msgstr "_Recuperar"
 
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "Por favor, verifique se o seu login e senha estão correctos."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Palavra-chave do OpenPGP não foi recebida"
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Remover da Lista"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "Invisível"
+#~ msgid "A_ccounts"
+#~ msgstr "_Contas"
 
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "offline"
+#~ msgid "_Filter:"
+#~ msgstr "_Filtro:"
 
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "Estou %s"
+#~ msgid "Ask:"
+#~ msgstr "Perguntar:"
 
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-#, fuzzy
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Esta mensagem é encriptada]"
+#~ msgid "Client:"
+#~ msgstr "Cliente:"
 
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Assunto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr ""
+#~ msgid "OS:"
+#~ msgstr "SO:"
 
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Bindings do python D-Bus estão em falta neste computador"
+#~ msgid "Subscription:"
+#~ msgstr "Subscrição:"
 
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Se esta não for a língua para a qual quer destacar palavras mal "
+#~ "soletradas,  ajuste, por favor, o seu $LANG como apropriado.  Por "
+#~ "exemplo, para o francês, faça 'export LANG=fr_FR' ou 'export LANG=fr_FR."
+#~ "UTF-8' em ~/.bash_profile ou, para o fazer globalmente, em /etc/profile.\n"
+#~ "\n"
+#~ "A função de destaque de palavras mal soletradas não será usada"
 
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
+#~ msgid "Every %s _minutes"
+#~ msgstr "Todos os %s _minutos"
 
-#: ../src/common/exceptions.py:30
-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"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: ../src/common/exceptions.py:38
-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"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Vê-lo-á sempre como estando offline."
 
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s está agora  %s (%s)"
 
-#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "one"
-msgstr "Nenhum"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Uma ligação não está disponível"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr ""
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
-#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "three"
-msgstr "Rua:"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uso: %s %s %s \n"
+#~ "\t"
 
-#: ../src/common/fuzzyclock.py:42
 #, fuzzy
-msgid "four"
-msgstr "Porta:"
+#~ msgid "Private Chat"
+#~ msgstr "Iniciar Conversa"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "five"
-msgstr "Ficheiro"
+#~ msgid "Group Chat"
+#~ msgstr "Chat"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:43
-#, fuzzy
-msgid "seven"
-msgstr "Evento"
+#~ msgid "%s is now %s"
+#~ msgstr "%s está agora %s"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr ""
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s não parece ser um JID válido"
 
-#: ../src/common/fuzzyclock.py:43
 #, fuzzy
-msgid "nine"
-msgstr "_Continuar"
+#~ msgid "%s - Gajim"
+#~ msgstr "Gajim"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr ""
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr ""
+#~ "É necessária uma ligação para receber as suas informações de contacto."
 
-#: ../src/common/fuzzyclock.py:43
 #, fuzzy
-msgid "eleven"
-msgstr "Apagar MOTD"
+#~ msgid "_New group chat"
+#~ msgstr "Chat"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr ""
+#~ msgid "_Log on"
+#~ msgstr "_Ligar"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr ""
+#~ msgid "Log _off"
+#~ msgstr "_Desligar"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr ""
+#~ msgid "Save passphrase"
+#~ msgstr "Guardar frase de acesso"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "ten to %1"
-msgstr "Registar para %s"
-
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr ""
+#~ msgid "Drop %s in group %s"
+#~ msgstr "De %s na sala %s"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:62
 #, fuzzy
-msgid "Morning"
-msgstr "A trabalhar"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:63
 #, fuzzy
-msgid "Noon"
-msgstr "Nenhum"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr ""
+#~ msgid "Affiliation:"
+#~ msgstr "Filiação: "
 
-#: ../src/common/fuzzyclock.py:63
 #, fuzzy
-msgid "Evening"
-msgstr "Evento"
-
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr ""
-
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr ""
-
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "Caractere inválido no nome de utilizador"
-
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "Endereço de servidor necessário."
-
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "Caractere inválido no hostname."
-
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "Caractere inválido no recurso."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "_Ocupado"
-
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "Ocupado"
-
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "_Indisponível"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "_Livre para conversar"
-
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "Livre para conversar"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Ligado ao servidor %s:%s com %s"
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "_Disponível"
+#~ msgid "invisible"
+#~ msgstr "Invisível"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Disponível"
+#~ msgid "offline"
+#~ msgstr "offline"
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "Ligando"
-
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "A_usente"
-
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "_Offline"
-
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "Offline"
-
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "In_visível"
-
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "Desconhecido"
-
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "Contém erros"
-
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "Nenhuma"
-
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "Para"
-
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "Ambos"
-
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "Nenhum"
-
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "Subscrição"
-
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "?Função do Contacto no Chat:Nenhuma"
+#~ msgid "I'm %s"
+#~ msgstr "Estou %s"
 
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "Moderadores"
-
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "Moderador"
-
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "Participantes"
-
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "Participante"
-
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "Visitantes"
-
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "Visitante"
-
-#: ../src/common/helpers.py:301
 #, fuzzy
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Função do Contacto no Chat:Nenhuma"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "Gajim - %d mensagem não lida"
+#~ msgstr[1] "Gajim - %d mensagens não lidas"
 
-#: ../src/common/helpers.py:303
 #, fuzzy
-msgid "Owner"
-msgstr "_Dono"
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "Gajim - %d mensagem de chat não lida"
+#~ msgstr[1] "Gajim - %d mensagens de chat não lidas"
 
-#: ../src/common/helpers.py:305
 #, fuzzy
-msgid "Administrator"
-msgstr "_Administrador"
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "Gajim - %d mensagem privada não lida"
+#~ msgstr[1] "Gajim - %d mensagens privadas não lidas"
 
-#: ../src/common/helpers.py:307
 #, fuzzy
-msgid "Member"
-msgstr "_Membro"
-
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "está a prestar atenção à conversa"
-
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "está a fazer outra coisa qualquer"
-
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "está a escrever uma mensagem..."
-
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "pausa na composição da mensagem"
-
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "fechou a janela de conversa ou aba"
-
-#: ../src/common/helpers.py:881
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/common/helpers.py:887
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d mensagem não lida"
-msgstr[1] "Gajim - %d mensagens não lidas"
-
-#: ../src/common/helpers.py:893
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d mensagem de chat não lida"
-msgstr[1] "Gajim - %d mensagens de chat não lidas"
-
-#: ../src/common/helpers.py:899
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d mensagem privada não lida"
-msgstr[1] "Gajim - %d mensagens privadas não lidas"
-
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: impossível abrir %s para leitura"
-
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr ""
-
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr "cyan"
-
-#: ../src/common/optparser.py:302
-#, fuzzy
-msgid "migrating logs database to indeces"
-msgstr "a criar base de dados dos logs"
-
-#: ../src/common/passwords.py:86
-#, fuzzy, python-format
-msgid "Gajim account %s"
-msgstr "para conta %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
-#, fuzzy
-msgid "Connection to host could not be established"
-msgstr "Ligação ao peer não pode ser estabelecida."
-
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Para continuar a enviar e receber mensagens, precisará de se reconectar."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, fuzzy, python-format
-msgid "Unable to bind to port %d."
-msgstr "Impossível entrar na sala"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, fuzzy, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Impossível ligar a \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Esta mensagem é encriptada]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, fuzzy, python-format
-msgid "Error while adding service. %s"
-msgstr "erro ao enviar"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Ligação ao peer não pode ser estabelecida."
 
 #, fuzzy
 #~ msgid "_New room"
@@ -6745,9 +10069,6 @@ msgstr "erro ao enviar"
 #~ msgid "Role: "
 #~ msgstr "Função: "
 
-#~ msgid "Affiliation: "
-#~ msgstr "Filiação: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -6785,9 +10106,6 @@ msgstr "erro ao enviar"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nome de utilizador inválido"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Versão D-Bus desconhecida: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "Publicação vCard deu-se com sucesso"
 
@@ -6797,9 +10115,6 @@ msgstr "erro ao enviar"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Fazendo a 'migração' dos logs..."
 
-#~ msgid "_Join New Room"
-#~ msgstr "_Juntar-se a uma Nova Sala"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d mensagem não lida"
@@ -6815,18 +10130,9 @@ msgstr "erro ao enviar"
 #~ msgid "Send File"
 #~ msgstr "Enviar Ficheiro"
 
-#~ msgid "Underline"
-#~ msgstr "Sublinhar"
-
-#~ msgid "Would you like to overwrite it?"
-#~ msgstr "Deseja sobre-escrevê-lo?"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Juntar-se a uma Nova Sala..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
-
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
@@ -6835,10 +10141,6 @@ msgstr "erro ao enviar"
 #~ msgstr "Apagar Mensagem do Dia"
 
 #, fuzzy
-#~ msgid "I want a notification popup:"
-#~ msgstr "Noti_ficação do estado da conversa:"
-
-#, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s quer enviar-lhe um ficheiro:"
 
@@ -6854,18 +10156,12 @@ msgstr "erro ao enviar"
 #~ msgid "_XML Console..."
 #~ msgstr "Consola _XML..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "_Escolher Avatar"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Usar vista compacta quando uma janela de conversa é aberta"
 
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Usar vista compacta quando uma janela de chat é aberta"
 
-#~ msgid "plain"
-#~ msgstr "simples"
-
 #~ msgid "Send"
 #~ msgstr "Enviar"
 
@@ -6879,9 +10175,6 @@ msgstr "erro ao enviar"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "A migração dos registos de conversas (logs) deu-se com sucesso."
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Iniciar conversa com a conta %s"
@@ -6898,15 +10191,9 @@ msgstr "erro ao enviar"
 #~ msgid "Sound"
 #~ msgstr "Som"
 
-#~ msgid "Text"
-#~ msgstr "Texto"
-
 #~ msgid "Image"
 #~ msgstr "Imagem"
 
-#~ msgid "From %s"
-#~ msgstr "De %s"
-
 #~ msgid "To %s"
 #~ msgstr "Para %s"
 
@@ -6982,9 +10269,6 @@ msgstr "erro ao enviar"
 #~ "pysqlite3, se quiser migrar os seus logs para a nova base de dados, por "
 #~ "favor, leia: http://trac.gajim.org/wiki/MigrateLogToDot9DB . Saindo..."
 
-#~ msgid "Image is too big"
-#~ msgstr "Imagem é muito grande"
-
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
@@ -6992,9 +10276,6 @@ msgstr "erro ao enviar"
 #~ "Imagem para emoticon tem de ser menor ou igual a 24 pixels em largura e "
 #~ "24 em altura."
 
-#~ msgid "<b>Changes in latest version</b>"
-#~ msgstr "<b>Mudanças na última versão</b>"
-
 #~ msgid "Check for new _version on Gajim startup"
 #~ msgstr "Procurar por uma nova versão ao arranque"
 
@@ -7033,9 +10314,6 @@ msgstr "erro ao enviar"
 #~ msgid "Send Authorization to"
 #~ msgstr "Enviar Autorização para"
 
-#~ msgid "<b>Log</b>"
-#~ msgstr "<b>Registos</b>"
-
 #~ msgid "Log presences in _contact's log file"
 #~ msgstr "Registar as presenças no ficheiro de log do _contacto"
 
@@ -7066,9 +10344,6 @@ msgstr "erro ao enviar"
 #~ msgid "_Latest"
 #~ msgstr "Ú_ltimo"
 
-#~ msgid "_Previous"
-#~ msgstr "_Anterior"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s está agora %s: %s"
 
@@ -7096,15 +10371,9 @@ msgstr "erro ao enviar"
 #~ "Pode configurar opções avançadas em \"Editar->Contas\" na janela "
 #~ "principal. "
 
-#~ msgid "Error:"
-#~ msgstr "Erro:"
-
 #~ msgid "Service"
 #~ msgstr "Serviço"
 
-#~ msgid "Node"
-#~ msgstr "Nó"
-
 #~ msgid ""
 #~ "Your new account has been created and added to your gajim configuration.\n"
 #~ "You can set advanced account options using \"Edit->Accounts\" in the main "
@@ -7140,10 +10409,6 @@ msgstr "erro ao enviar"
 #~ msgid "Edit"
 #~ msgstr "Editar"
 
-#, fuzzy
-#~ msgid "<b>Please fill in the data for your existing account</b>"
-#~ msgstr "Por favor preencha os dados para a sua conta existente"
-
 #~ msgid "Check if you want to register for a new jabber account"
 #~ msgstr "Marque se quiser registar uma nova conta Jabber"
 
@@ -7159,9 +10424,6 @@ msgstr "erro ao enviar"
 #~ msgid "_Register new account"
 #~ msgstr "_Registar nova conta"
 
-#~ msgid "Gajim - a GTK+ Jabber client"
-#~ msgstr "Gajim - Um cliente Jabber GTK+"
-
 #~ msgid "You just received a new message in room \"%s\""
 #~ msgstr "Recebeu uma mensagem na sala \"%s\""
 
@@ -7196,9 +10458,6 @@ msgstr "erro ao enviar"
 #~ msgid "Inactivate account"
 #~ msgstr "Não tem nenhuma conta activa"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Entrar num Chat..."
-
 #, fuzzy
 #~ msgid "Po_sition:"
 #~ msgstr "Cargo:"
@@ -7230,9 +10489,6 @@ msgstr "erro ao enviar"
 #~ msgstr[0] "Gajim - uma mensagem não lida"
 #~ msgstr[1] "Gajim - %d mensagens não lidas"
 
-#~ msgid "Unknown type %s "
-#~ msgstr "Tipo desconhecido %s"
-
 #~ msgid "Gajim disconnected you from %s"
 #~ msgstr "Gajim desligou-o de %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b963daff8..796434bdf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,15 +5,11 @@
 #
 # junix <junix@targetlinux.org>, 2005.
 # Gajim <gajim-devel@gajim.org>, 2007.
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:253 ../src/gajim-remote.py:254
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:261
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:263
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-28 20:33+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-11-28 11:55-0300\n"
 "Last-Translator: Davidson Paulo <dpaulo@fedoraproject.org>\n"
 "Language-Team: Português Brasileiro <gajim-devel@gajim.org>\n"
@@ -38,7 +34,7 @@ msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
 msgstr "_Entrar em uma Conferência..."
 
@@ -47,7 +43,7 @@ msgid "_Add Contact..."
 msgstr "_Adicionar Contato..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Discover Services"
 msgstr "_Descubra Serviços"
 
@@ -64,11 +60,16 @@ msgid "_Open Gmail Inbox"
 msgstr "_Abrir Caixa de Entrada do Gmail"
 
 #: ../data/glade/account_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Informações Pessoais"
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Start Chat..."
 msgstr "_Iniciar Conversa..."
 
-#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/account_context_menu.glade.h:9
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Status"
@@ -88,7 +89,8 @@ 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
-msgid "<b>Please fill in the data for your new account</b>"
+#, fuzzy
+msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor preencha os dados da sua nova conta</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
@@ -96,64 +98,70 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Por favor, selecione um servidor</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Clique para ver os recursos do servidor jabber (como transportes MSN, ICQ, "
 "etc)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu clicar em Fim"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente de Configuração de Conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 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:11
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrará a senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Gerenciar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Salvar senha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Configurar perfil quando eu conectar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 #: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Usa nome de máquina/porta customizados"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -161,46 +169,46 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Seu JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Hostname:"
 msgstr "_Nome do Computador:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
 #: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:31
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "Nome de _usuário"
 
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
@@ -217,7 +225,7 @@ 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:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Conta"
 
@@ -226,28 +234,27 @@ msgid "Account Modification"
 msgstr "Alteração da Conta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Administration operations"
 msgstr "Operações de administração"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:8
 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:7
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 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:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "Alterar Senha"
 
 #: ../data/glade/account_modification_window.glade.h:10
-#: ../data/glade/accounts_window.glade.h:9
 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 "
@@ -260,60 +267,61 @@ msgstr ""
 "TLS será desabilitado"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Escolha a chave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:13
 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:12
+#: ../data/glade/accounts_window.glade.h:14
 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:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Conexão"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:489
-#: ../src/notify.py:520 ../src/notify.py:532 ../src/common/helpers.py:998
-#: ../src/common/helpers.py:1010
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 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:19
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:372 ../src/roster_window.py:637
-#: ../src/roster_window.py:1384 ../src/roster_window.py:1760
-#: ../src/roster_window.py:2147 ../src/roster_window.py:2661
-#: ../src/roster_window.py:2779 ../src/common/contacts.py:314
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Geral"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome do Computador:"
 
 #: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:23
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -323,7 +331,7 @@ msgstr ""
 "corretamente."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -341,7 +349,7 @@ msgstr ""
 "'leitura' somente para você"
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -351,7 +359,7 @@ msgstr ""
 "usando esta conta"
 
 #: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -362,49 +370,48 @@ msgstr ""
 "mudança no status global (definido pela caixa no fundo da janela da lista)"
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2028
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. None means no proxy profile selected
-#. GPG Key
 #: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1142
-#: ../src/config.py:1213 ../src/config.py:1460 ../src/config.py:1465
-#: ../src/config.py:1926 ../src/config.py:2013 ../src/config.py:2027
-#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:344
-#: ../src/dialogs.py:346 ../src/roster_window.py:1864
-#: ../src/roster_window.py:1871 ../src/roster_window.py:1878
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Nenhum"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porta:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -415,22 +422,21 @@ msgstr ""
 "conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:43
 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
-#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Resour_ce:"
 msgstr "Recur_so:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -450,31 +456,30 @@ msgid "Save _passphrase (insecure)"
 msgstr "Salvar _frase de acesso (inseguro)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Salvar histórico para todos os contatos desta conta"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 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:49
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 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/accounts_window.glade.h:51
 #: ../data/glade/synchronise_contacts_dialog.glade.h:2
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Sincronizar contatos"
 
 #: ../data/glade/account_modification_window.glade.h:44
-#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
 
@@ -497,31 +502,44 @@ msgstr "_Jabber ID:"
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../data/glade/accounts_window.glade.h:14
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<i>Privacidade</i>"
+
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Accounts"
+msgstr "Contas"
+
+#: ../data/glade/accounts_window.glade.h:11
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:16
 #: ../data/glade/zeroconf_information_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
 #. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
 #: ../data/glade/xml_console_window.glade.h:4
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Primeiro nome:"
 
-#: ../data/glade/accounts_window.glade.h:22
+#: ../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:27
+#: ../data/glade/accounts_window.glade.h:29
 #: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
@@ -532,29 +550,28 @@ msgstr ""
 "pode selecionar outra aqui.\n"
 "Considere a possível modificação das regras do seu firewall. "
 
-#: ../data/glade/accounts_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:511
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
 #: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Último nome:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "Mes_clar contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2731
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use GPG _Agent"
 msgstr "Usar o _Agente GPG"
 
@@ -564,18 +581,26 @@ msgid "Use custom port:"
 msgstr "Usar servidor/porta personalizado"
 
 #: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
 #: ../data/glade/features_window.glade.h:4
 msgid "gtk-close"
 msgstr "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:62
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
+
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "C_onta:"
@@ -745,7 +770,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condições</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
@@ -762,7 +787,7 @@ msgid "All statuses"
 msgstr "Totos os status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:96 ../src/common/helpers.py:255
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Afastado"
 
@@ -779,7 +804,7 @@ msgid "Have "
 msgstr "Possui"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -788,7 +813,7 @@ msgid "Launch a command"
 msgstr "Executar um comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Não Disponível"
 
@@ -918,6 +943,29 @@ msgstr "Você recebeu uma nova entrada:"
 msgid "Blocked Contacts"
 msgstr "Contatos Bloqueados"
 
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Mensagens de Status Disponíveis</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Tema</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Sons</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Alterar Senha"
@@ -947,7 +995,7 @@ msgid "Join _Group Chat"
 msgstr "_Entrar em uma Conferência"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "_Adicionar à Lista..."
 
@@ -974,39 +1022,35 @@ msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Clique para ver o histórico de conversas com este contato"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
 msgid "Invite _Contacts"
 msgstr "Convidar _Contatos"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
 msgstr "Alternar para Criptografia End to End"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Ativar criptografia Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "_Adicionar à  Lista"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
-#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1046,6 +1090,15 @@ msgstr "Configuração da Sala"
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descrição</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
 #: ../data/glade/features_window.glade.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Listas dos possíveis recursos do Gajim:</b>"
@@ -1109,7 +1162,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:790
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1117,7 +1170,7 @@ msgstr "_Continuar"
 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:191
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
@@ -1165,7 +1218,7 @@ msgstr "Customização de Temas do Gajim"
 msgid "Gone"
 msgstr "Ido"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inativo"
 
@@ -1214,26 +1267,22 @@ msgid "Change _Subject..."
 msgstr "Alterar _Assunto..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Clique para ver o histórico de conversas nesta sala"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4
 msgid "Configure _Room..."
 msgstr "Configurar _Sala..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:5
+#: ../data/glade/gc_control_popup_menu.glade.h:4
 msgid "_Bookmark"
 msgstr "_Favoritos"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:5
 msgid "_Destroy Room"
 msgstr "_Excluir Sala"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/glade/gc_control_popup_menu.glade.h:7
 msgid "_Manage Room"
 msgstr "_Gerenciar Sala"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:9
+#: ../data/glade/gc_control_popup_menu.glade.h:8
 msgid "_Minimize on close"
 msgstr "_Minimizar ao fechar"
 
@@ -1277,22 +1326,19 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Criar nova postagem"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:280
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:147
-#: ../src/history_manager.py:178
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Assunto"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1306,85 +1352,61 @@ msgstr ""
 "Gajim não está executando. Evite apagamentos com contatos que você esteja "
 "conversando no momento."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gerenciador de Histórico de Logs do Gajim"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Deletar"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gerenciador de Histórico de Logs do Gajim"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Buscar no Bando de Dados"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "<b>History Viewer</b>"
-msgstr "<b>Visualizador de Histórico</b>"
-
-#: ../data/glade/history_window.glade.h:2
-msgid "<b>JID Selection</b>"
-msgstr "<b>Seleção de JID</b>"
-
-#: ../data/glade/history_window.glade.h:3
-msgid ""
-"Choose the chatlog you want to view. \n"
-"Enter the jid of a groupchat or a contact here. For online accounts you can "
-"even enter a a contact's nickname."
-msgstr ""
-"Selecione o registro de conversa que você quer ver. \n"
-"Entre com o JID de uma sala ou contato aqui. Para contas online você sempre "
-"entra com o apelido do contato."
-
-#: ../data/glade/history_window.glade.h:5 ../src/history_window.py:224
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Histórico de Conversação"
 
-#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/history_window.glade.h:2
+#, fuzzy
 msgid ""
-"Current History\n"
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
 "All Chat Histories"
 msgstr ""
 "Histórico Atual\n"
 "Históricos de Todas as Conversas"
 
-#: ../data/glade/history_window.glade.h:8
-#: ../data/glade/search_window.glade.h:2
-msgid "Search"
+#: ../data/glade/history_window.glade.h:5
+#, fuzzy
+msgid "Search:"
 msgstr "Buscar"
 
-#: ../data/glade/history_window.glade.h:9
+#: ../data/glade/history_window.glade.h:6
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico de Conversação"
 
-#: ../data/glade/history_window.glade.h:10
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1182
-msgid "_Search"
-msgstr "_Buscar"
-
-#: ../data/glade/history_window.glade.h:11
-msgid "in"
-msgstr "em"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Negar"
-
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Convite Recebido"
-
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1385
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
@@ -1394,8 +1416,6 @@ msgstr "Entra nesta sala automaticamente quando eu conectar"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Apelido:"
 
@@ -1413,8 +1433,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1170
-#: ../src/disco.py:1625
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -1451,6 +1471,21 @@ msgstr "Servidor:"
 msgid "Title:"
 msgstr "Título:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Configuração da Sala"
+
+#: ../data/glade/manage_pep_services_window.glade.h:2
+#, fuzzy
+msgid "_Configure"
+msgstr "_Continuar"
+
+#: ../data/glade/manage_pep_services_window.glade.h:3
+#, fuzzy
+msgid "gtk-delete"
+msgstr "gtk-close"
+
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Propriedades</b>"
@@ -1472,8 +1507,6 @@ msgid "Manage Proxy Profiles"
 msgstr "Gerenciar Perfis de Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1494,25 +1527,52 @@ msgid "_Host:"
 msgstr "_Computador:"
 
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Clique para inserir um emoticon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adicionar contato para a lista"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control2.py:1257
-#: ../src/chat_control.py:1268
-msgid "OpenPGP Encryption"
-msgstr "Criptografia OpenPGP"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Ações"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+msgid "Change your nickname (Ctrl+N)"
+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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está prestando a atenção na 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+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1529,47 +1589,73 @@ msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
 #: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Ações</b>"
+
+#: ../data/glade/preferences_window.glade.h:4
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Aparência da Conversa</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/glade/preferences_window.glade.h:5
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Aba Cores do Bate-papo</b>"
+
+#: ../data/glade/preferences_window.glade.h:6
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificações Visuais</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Custom</b>"
 msgstr "<b>Customizar</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
-msgid "<b>Format of a line</b>"
-msgstr "<b>Formato da linha</b>"
+#: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Sons</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
+#: ../data/glade/preferences_window.glade.h:10
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opções do Gmail</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensagens de Status Disponíveis</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:13
 msgid "<b>Privacy</b>"
 msgstr "<i>Privacidade</i>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Aparência da Lista</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensagens de Status Disponíveis</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
 msgid "<b>Themes</b>"
 msgstr "<b>Tema</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avançado"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1579,42 +1665,20 @@ msgstr ""
 "Escrevendo somente\n"
 "Desabilitado"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permite janela/notificação quando eu estou _afastado/NA/ocupado/invisível"
 
-#: ../data/glade/preferences_window.glade.h:21
-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"
-
-#: ../data/glade/preferences_window.glade.h:22
-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 will "
-"use the default one set here"
-msgstr ""
-"Um exemplo: se você tiver habilitado a mensagem de status para afastado, o "
-"Gajim não perguntará mais por uma mensagem de status quando você mudá-lo "
-"para afastado, ele usará o padrão definido aqui"
-
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../data/glade/preferences_window.glade.h:24
-msgid "Auto _away after:"
-msgstr "Marcar como _afastado depois:"
-
-#: ../data/glade/preferences_window.glade.h:25
-msgid "Auto _not available after:"
-msgstr "Marcar como _afastado depois:"
-
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/glade/preferences_window.glade.h:27
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1628,56 +1692,57 @@ msgstr ""
 "Sempre usar aplicações no padrão KDE\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
-msgstr ""
-"Marque esta opção somente se alguém que não está na sua lista estiver "
-"mandando SPAM's. Utilize com cuidado, porque isto bloqueia todas as "
-"mensagens de qualquer contato que você não possuir na sua lista e queria lhe "
-"enviar uma mensagem"
-
 #: ../data/glade/preferences_window.glade.h:32
-msgid "Configure color and font of the interface"
-msgstr "Configurar cores e fontes da interface"
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Mensagem de status:"
 
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "Mensagens de Status Padrão"
+#, fuzzy
+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:34
+msgid "Configure color and font of the interface"
+msgstr "Configurar cores e fontes da interface"
+
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
-"Determinado pelo remetente\n"
-"Mensagem de chat\n"
-"Mensagem simples"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Mostrar a_vatar dos contatos na lista"
+
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "Mostrar detalhes _extras dos emails"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Mostrar a_vatar dos contatos na lista"
+
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar a_vatar dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Mostrar a_vatar dos contatos na lista"
+
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar _mensagem de status da lista de contato"
 
-#: ../data/glade/preferences_window.glade.h:40
-msgid "Emoticons:"
-msgstr "Emoticons:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "Eventos"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1687,7 +1752,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:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1697,7 +1762,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:44
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1705,11 +1770,20 @@ 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:46
-msgid "Hides buttons in chatwindows to "
-msgstr "Esconder os botões nas janelas de conversa em"
+#: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Esconder os botões nas janelas de conversa."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
+
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1717,7 +1791,19 @@ msgstr ""
 "Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
 "emails"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:53
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1725,7 +1811,7 @@ msgstr ""
 "Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1733,7 +1819,66 @@ 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:50
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
+"conferência"
+
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
+"conferência"
+
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
+"conferência"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Marque esta opção somente se alguém que não está na sua lista estiver "
+"mandando SPAM's. Utilize com cuidado, porque isto bloqueia todas as "
+"mensagens de qualquer contato que você não possuir na sua lista e queria lhe "
+"enviar uma mensagem"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
+"emails"
+
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1743,7 +1888,13 @@ 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:51
+#: ../data/glade/preferences_window.glade.h:65
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1751,43 +1902,46 @@ 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:52
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorar conteúdo formatado nas mensagens recebidas."
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Log _encrypted chat session"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:68
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Tornar a janela de mensagem compacta"
+
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/preferences_window.glade.h:54
-msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
-msgstr ""
-"Nunca\n"
-"Sempre\n"
-"Por conta\n"
-"Por tipo"
+#: ../data/glade/preferences_window.glade.h:70
+#, fuzzy
+msgid "Notifications"
+msgstr "Notification-daemon"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifique-me sobre contatos ao _conectar"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifique-me sobre contatos ao _desconectar"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Notificar cada nova mensagem do _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "Informações Pessoais"
+
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1797,28 +1951,19 @@ msgstr ""
 "Notificar-me sobre\n"
 "Mostra apenas na lista"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:66
-msgid "Privacy"
-msgstr "Privacidade"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "Set status message to reflect currently playing _music track"
-msgstr ""
-"Definir a mensagem de status de acordo com a música que estiver sendo tocada."
-
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1826,131 +1971,144 @@ msgstr ""
 "Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se "
 "marcado, o Gajim apenas mostrará as mensagens em texto puro."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Ordena contatos pelo status"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "_Conjunto de ícones de status:"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "Parado"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:74
-msgid "The auto away status message"
-msgstr "A mensagem de status para o ausente automático"
-
-#: ../data/glade/preferences_window.glade.h:75
-msgid "The auto not available status message"
-msgstr "A mensagem de status para o afastado automático"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:76
-msgid "Treat all incoming messages as:"
-msgstr "Tratar todas as mensagens recebidas como:"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr "Usar conjunto de ícones de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "Use only one message _window:"
-msgstr "Usar apenas uma _janela de mensagem:"
-
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Usar o _padrão do sistema"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Quando novo evento é recebido:"
 
-#: ../data/glade/preferences_window.glade.h:81
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"Funciona para os reprodutores Rhythmbox e Muine. Para mais reprodutores, por "
-"favor visite a página http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-
-#: ../data/glade/preferences_window.glade.h:82
-msgid "_Advanced Notifications Control..."
-msgstr "Controle _Avançado de Notificações..."
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "Marcar como _afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "_Mostrar notificações de status de conversa:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticons:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/glade/preferences_window.glade.h:86
-msgid "_Font:"
-msgstr "_Fonte:"
-
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:99
 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:89
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorar conteúdo formatado nas mensagens recebidas."
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "Mensagem _recebida:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/glade/preferences_window.glade.h:92
-msgid "_Make message windows compact"
-msgstr "_Tornar a janela de mensagem compacta"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Marcar como _afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "Mensagem _enviada:"
 
-#: ../data/glade/preferences_window.glade.h:95
-msgid "_Player:"
-msgstr "_Tocador de som:"
-
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as Cores _Padrões"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Send chat state notifications:"
 msgstr "_Enviar notificações de status de conversa:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Sort contacts by status"
-msgstr "_Ordena contatos pelo status"
-
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/glade/preferences_window.glade.h:100
-msgid "_URL:"
-msgstr "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "_Entrar em uma Conferência"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Fora da lista"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minutos"
 
@@ -1986,6 +2144,10 @@ msgstr "Todos"
 msgid "Allow"
 msgstr "Permitir"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Negar"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
@@ -1994,7 +2156,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2258
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Lista de Privacidade"
 
@@ -2034,138 +2196,177 @@ msgstr "para seu status para mim"
 msgid "to view my status"
 msgstr "para ver meu status"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Adicionar uma regra</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Sobre"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Endereço"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Aniversário:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Customizar</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Aniversário:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Customizar</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Cidade:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Clique para definir seu avatar"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Departamento:"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Empresa:"
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "E-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Country:"
-msgstr "País:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Complemento:"
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-msgid "Department:"
-msgstr "Departamento:"
+#. Family Name
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Família:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:17
-msgid "Extra Address:"
-msgstr "Complemento:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "Nome Completo"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:19
-msgid "Family:"
-msgstr "Família:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:21
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Homepage:"
 
+#. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Full Name"
-msgstr "Nome Completo"
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Adicionar uma regra</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Tema</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:24
-msgid "Given:"
-msgstr "Nome:"
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Apelido:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:25
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefone:"
+
+#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condições</b>"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
-msgid "Middle:"
-msgstr "Nome do meio:"
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Código Postal:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<i>Privacidade</i>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Personal Info"
-msgstr "Informações Pessoais"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sons</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:35
-msgid "Phone No.:"
-msgstr "Telefone:"
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Configurações</b>"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Position:"
-msgstr "Cargo:"
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Configurações</b>"
 
+#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
-msgid "Postal Code:"
-msgstr "Código Postal:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sons</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
 #: ../data/glade/vcard_information_window.glade.h:39
-msgid "Prefix:"
-msgstr "Prefixo:"
+msgid "About"
+msgstr "Sobre"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:307
-msgid "Role:"
-msgstr "Função:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:42
-msgid "State:"
-msgstr "Estado:"
+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:44
-msgid "Street:"
-msgstr "Rua:"
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: YYYY-MM-DD"
 
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:48
-msgid "Suffix:"
-msgstr "Sobrenome:"
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.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/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Trabalho"
 
@@ -2181,13 +2382,10 @@ msgstr "Remover conta _somente do Gajim"
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
-#. Remove
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-#: ../src/roster_window.py:2557 ../src/roster_window.py:2767
-#: ../src/roster_window.py:2903
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -2209,135 +2407,164 @@ msgstr "Editar _Grupos..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2860
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Executar Comando..."
 
+#. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2473
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2697 ../src/roster_window.py:2831
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Remover"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Enviar Status Perso_nalizado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Enviar _Mensagem Simples..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Enviar _Arquivo..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Definir _Avatar Personalizado..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Permitir que ele/ela veja meu status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2547 ../src/roster_window.py:2758
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Proibir ele/ela de ver meu status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "_Gerenciar Contato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:19
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:20
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Inscrição"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-#: ../src/roster_window.py:2541 ../src/roster_window.py:2752
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Contas"
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "nove"
 
-#: ../data/glade/roster_window.glade.h:2
+#: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Adicionar _Contato..."
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
 msgstr "Re_cursos"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "Transferência de _Arquivos"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Perguntas freqüentes (online)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contatos desc_onectados"
 
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Mostre _Lista"
+
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Ações"
+
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Contents"
 msgstr "_Índices"
 
-#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1358
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Send Single Message..."
 msgstr "_Enviar Mensagem Simples..."
 
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Ver"
 
@@ -2346,15 +2573,23 @@ 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
+msgid "Search"
+msgstr "Buscar"
+
 #: ../data/glade/search_window.glade.h:3
 msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:2915
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "_Informações"
 
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Buscar"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Ir"
@@ -2482,55 +2717,64 @@ msgid "_Group Chat"
 msgstr "_Conferência"
 
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:5
-msgid "Ask:"
-msgstr "Perguntar:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Ações</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Cliente:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Customizar</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Recurso:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Configurações</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrição</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Customizar</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Comentários"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Configured avatar:"
 msgstr "Configurar _avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contato"
 
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Informações do Contato"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "More"
 msgstr "Mais"
 
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "OS:"
-msgstr "SO:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Recurso:"
-
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:46
-msgid "Subscription:"
-msgstr "Inscrição:"
-
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "User avatar:"
 msgstr "Avatar do usuário:"
 
@@ -2570,13 +2814,13 @@ msgstr "Atribuir chave OpenPGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2530
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:2887
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Renomear"
 
@@ -2592,54 +2836,85 @@ msgstr "JID local:"
 msgid "Personal"
 msgstr "Pessoal"
 
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Recurso:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
+
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Alterar Conta"
 
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Informações do Contato"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+#, fuzzy
+msgid "Service changed the session identifier."
+msgstr "O cliente em %s cancelou a negociação da sessão."
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
+
 #. For i18n
-#: ../src/advanced.py:56
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Ativado"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Desativado"
 
-#: ../src/advanced.py:58
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced.py:59
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Inteiro"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:61
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/advanced.py:70
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Nome da preferência"
 
-#: ../src/advanced.py:76
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:84
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:140
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Nada)"
 
-#. we talk about password
-#: ../src/advanced.py:243
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Escondido"
 
@@ -2648,227 +2923,321 @@ msgstr "Escondido"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Inglês"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretão"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Alemão"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Inglês Britânico"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francês"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norueguês (b)"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Chinês (Ch)"
 
-#: ../src/chat_control2.py:310 ../src/chat_control.py:313
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control2.py:333 ../src/chat_control2.py:549
-#: ../src/chat_control.py:336 ../src/chat_control.py:559
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control2.py:334 ../src/chat_control2.py:550
-#: ../src/chat_control.py:337 ../src/chat_control.py:560
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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_control2.py:1176 ../src/chat_control.py:1186
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Criptografia habilitada"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Fora da lista"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" by %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control2.py:1271 ../src/chat_control.py:1282
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s não tem a transmissão uma chave de OpenPGP, nem uma foi atribuída"
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
 
-#: ../src/chat_control2.py:1314 ../src/chat_control.py:1325
-#: ../src/groupchat_control.py:1433
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Criptografia desabilitada"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr "A sessão SERÁ gravada"
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "A sessão NÃO SERÁ gravada"
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Usar autenticação"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Usar autenticação"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
 msgstr ""
-"Comando não encontrado: /%s (se você quer enviar isto, use este prefixo /say)"
 
-#: ../src/chat_control2.py:1321 ../src/chat_control.py:1332
-#: ../src/groupchat_control.py:1456
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/chat_control2.py:1324 ../src/chat_control.py:1335
-#: ../src/groupchat_control.py:1470
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/chat_control2.py:1327 ../src/chat_control.py:1338
-#: ../src/groupchat_control.py:1475
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, esconde os botões do bate-papo."
 
-#: ../src/chat_control2.py:1330 ../src/chat_control.py:1341
-#: ../src/groupchat_control.py:1491
-#, python-format
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
 msgstr ""
 "Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
 "exemplo: /%s explodes.)"
 
-#: ../src/chat_control2.py:1334 ../src/chat_control.py:1345
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uso: /%s, envia um ping para o contato"
 
-#: ../src/chat_control2.py:1337 ../src/chat_control.py:1348
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uso: /%s, envia a mensagem para o contato"
 
-#: ../src/chat_control2.py:1340 ../src/chat_control.py:1351
-#: ../src/groupchat_control.py:1514
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
-#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504
-#: ../src/chat_control.py:1489 ../src/chat_control.py:1515
-msgid "Encryption enabled"
-msgstr "Criptografia habilitada"
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control2.py:1483 ../src/chat_control.py:1494
-msgid "Session WILL be logged"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Esta mensagem está criptografada]"
+
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control2.py:1485 ../src/chat_control.py:1496
-msgid "Session WILL NOT be logged"
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
-#: ../src/chat_control2.py:1492 ../src/chat_control.py:1503
-msgid "The following message was NOT encrypted"
-msgstr "A seguinte mensagem NÃO estava criptografada"
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
 
-#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509
-#: ../src/chat_control2.py:2155 ../src/chat_control.py:1507
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2166
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Criptografia desabilitada"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control2.py:1672 ../src/chat_control.py:1683
-#: ../src/conversation_textview.py:705 ../src/dialogs.py:732
-#: ../src/gajim.py:911 ../src/gajim.py:912 ../src/gajim.py:1436
-#: ../src/gajim.py:1687 ../src/roster_window.py:358
-#: ../src/roster_window.py:442 ../src/roster_window.py:1822
-#: ../src/roster_window.py:1832 ../src/roster_window.py:2072
-#: ../src/roster_window.py:2308 ../src/roster_window.py:3158
-#: ../src/roster_window.py:3397 ../src/roster_window.py:4759
-#: ../src/roster_window.py:4761 ../src/common/contacts.py:89
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:267
-msgid "Not in Roster"
-msgstr "Fora da lista"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+msgid "The following message was NOT encrypted"
+msgstr "A seguinte mensagem NÃO estava criptografada"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "A seguinte mensagem NÃO estava criptografada"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control2.py:1825 ../src/chat_control.py:1836
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control2.py:1826 ../src/chat_control.py:1837
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2876,32 +3245,2610 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/config.py:127 ../src/config.py:565
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+#, fuzzy
+msgid "Database Error"
+msgstr "Erro de Escrita em Disco"
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s agora está %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "criando banco de dados de logs"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, 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:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim sairá agora"
+
+#: ../src/common/check_paths.py:136
+#, 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:152
+#, python-format
+msgid "creating %s directory"
+msgstr "criando diretório %s"
+
+#: ../src/common/commands.py:80
+msgid "Change status information"
+msgstr "Alterar informação de status"
+
+#: ../src/common/commands.py:93
+msgid "Change status"
+msgstr "Alterar status"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr "Definir o tipo e a descrição da presença"
+
+#: ../src/common/commands.py:100
+msgid "Free for chat"
+msgstr "Livre para conversa"
+
+#: ../src/common/commands.py:101
+msgid "Online"
+msgstr "Conectado"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Muito afastado"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Não perturbe"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Desconectado"
+
+#: ../src/common/commands.py:110
+msgid "Presence description:"
+msgstr "Descrição da presença:"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "O status foi alterado."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+msgid "Leave Groupchats"
+msgstr "Sair das salas"
+
+#: ../src/common/commands.py:191
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s da sala %(room_jid)s"
+
+#: ../src/common/commands.py:195
+msgid "You have not joined a groupchat."
+msgstr "Você não entrou em uma sala."
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Selecione as salas das quais você quer sair"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+msgid "Groupchats"
+msgstr "Salas"
+
+#: ../src/common/commands.py:247
+msgid "You left the following groupchats:"
+msgstr "Você saiu das seguintes salas:"
+
+#: ../src/common/commands.py:259
+msgid "Forward unread messages"
+msgstr "Encaminhar mensagens não lidas"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr "Todas as mensagens não lidas foram encaminhadas."
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Minutos, depois do qual seu status mudam a afastado."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Afastado em conseqüência de estar inativo"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Minutos, depois do qual seu status mudam a nao disponível."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Não disponível em conseqüência de estar inativo"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+msgid "default"
+msgstr "padrão"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "Idioma usado pelo corretor ortográfico"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'sempre' - mostrar hora para cada mensagem.\n"
+"'às vezes' - mostrar hora a cada print_ichat_every_foo_minutes minutos.\n"
+"'nunca' - nunca mostrar a hora."
+
+#: ../src/common/config.py:121
+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 ""
+"Mostrar a hora nas conversas usando relógio impreciso. O valor de imprecisão "
+"varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
+"menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Aproveite os pare * /_ como caracteres de formatação. "
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Se verdadeiro, não remova */_. Assim * ABC * seja negrito(realce) mas com * "
+"* não removido."
+
+#: ../src/common/config.py:128
+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 ""
+"Usar marcação de texto ReStructured para HTML, mais formatação ASCII, se "
+"selecionada. Para informações sobre sintaxe, veja http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html (Se você quiser usar "
+"isso, instale o docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caracter a adicionar ao apelido quando se estiver usando o recurso de "
+"completar apelido (tecla Tab) na conferência."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"O caracter a ser proposto para adicionar ao final do apelido desejado quando "
+"ele já estiver sendo usado por outra pessoa na conferência."
+
+#: ../src/common/config.py:161
+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 ""
+"Esta opção lhe permite personalizar o carimbo de tempo que é exibido na "
+"conversação. Por exemplo: \"[%H:%M]\" mostrará \"[hora:minuto]\". Procure "
+"por strftime na documentação do Python: http://docs.python.org/lib/module-"
+"time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Adicionar * e [n] no título da lista?"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
+"papo for reaberta."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Quantos minutos mostrar ao exibir as últimas linhas da conversação anterior."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter "
+"(comportamento padrão do cliente ICQ da Mirabilis)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Quantas linhas armazenar com Ctrl+Acima."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou ' em "
+"WIKTIONARY ' que significam o uso wiktionary."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
+
+#: ../src/common/config.py:180
+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 ""
+"Se Verdadeiro, ouve aos sinais do D-Bus do NetworkManager e altera os status "
+"das contas (fornecido se eles não tiverem a opção listen_to_network_manager "
+"configurado para Falso e se estiverem sincronizadas com o status global) "
+"baseado no status da conexão de rede."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Notificações de estado de conversa enviados. Pode ser one of all, "
+"composing_only, disabled."
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Notificações de estado de conversa exibidos nas janelas de conversa. Pode "
+"ser one of all, composing_only, disabled."
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Quando não estiver exibindo a hora para cada mensagem (print_time == "
+"simetimes), exibi-lo a cada x minutos."
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Perguntar antes de fechar um aba ou janela de conferência."
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
+"espaço de JID's de conferências."
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
+"separada por espaço de salas separadas por jids."
+
+#: ../src/common/config.py:190
+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 ""
+"Lista separada por vírgula dos servidores que nós enviaremos, em adição às "
+"interfaces locais, para Transferência de Arquivo no caso de tradução de "
+"endereço/encaminhamento de porta."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "Notificar os eventos no ícone da bandeja do sistema."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Mostrar aba quando tiver apenas uma bate papo?"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Mostrar borda de caderno tabulada nas janelas de conversa?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Mostrar botão de fechar na aba?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
+"suas mensagens sejam gravadas?"
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+msgid "Preview new messages in notification popup?"
+msgstr "Pré-visualizar novas mensagens em uma janela popup?"
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
+"conferências."
+
+#: ../src/common/config.py:219
+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 ""
+"Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
+"opção só faz sentido quando a opção trayicon está sendo usada."
+
+#: ../src/common/config.py:220
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Se Verdadeiro, o Gajim verifica ao iniciar se é o cliente Jabber padrão."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
+"lidas. Dependendo do tema, este ícone pode ser animado."
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Se Verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
+"para cada contato sob o nome do contato na janela da lista."
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
+"ou tem um cache que é velho demais."
+
+#: ../src/common/config.py:229
+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 ""
+"Se Falso, você não verá por mais muito tempo a linha de status nas conversas "
+"quando um contato alterar seu status e/ou sua mensagem de status."
+
+#: ../src/common/config.py:230
+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 ""
+"pode ser \"none\" (nenhum), \"all\" (todos) ou \"in_and_out\" (dentro e "
+"fora). Se for \"none\", o Gajim não mostrará mais o status nas conferências "
+"quando um membro alterar seu status e/ou sua mensagem de status. Se for \"all"
+"\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
+"Gajim só mostrará FOO entradas/saídas em conferências."
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Não mostrar o avatar para o próprio transporte."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Não mostrar a lista na bandeja do sistema."
+
+#: ../src/common/config.py:238
+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 ""
+"Se Verdadeiro e as versões do GTK+ e PyGTK instaladas são menores que 2.8, "
+"faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
+"Janela) quando esperam eventos pendentes."
+
+#: ../src/common/config.py:240
+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 ""
+"O Jabberd1.4 não trata informações sha quando alguém entra numa sala "
+"protegida por senha. Mude esta opção para Falso para parar de emitir as "
+"informações sha na presenças de conferências."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Controlar a janela onde novas mensagens são colocadas.\n"
+"'sempre' - Todas as mensagens são enviadas para uma única janela.\n"
+"'nunca' - Todas as mensagens recebem sua própria janela.\n"
+"'por ação' - As mensagens para cada conta são enviadas a uma janela "
+"específica.'por tipo' - Cada tipo de mensagem (ex. bate-papo vs. "
+"conferência) são enviadas para uma janela específica. Nota, esta mudança "
+"requer o reinício do Gajim antes que tenham efeito."
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr ""
+"Se Falso, você não verá por muito tempo o avatar na janela do bate-papo."
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Se Verdadeiro, pressionando a tecla Esc fecha a aba/janela"
+
+#: ../src/common/config.py:246
+msgid "Hides the buttons in chat windows."
+msgstr "Esconder os botões nas janelas de conversa."
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Esconder o banner na janela de conferência"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Esconder o banner na janela de conversa para duas pessoas "
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
+
+#: ../src/common/config.py:250
+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 ""
+"Em uma conferência, mostrar o apelido no começo da linha apenas quando a "
+"mensagem atual não for da mesma pessoa que mandou a última."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Usar identação ao mesclar apelidos consecutivos."
+
+#: ../src/common/config.py:252
+msgid "Smooth scroll message in conversation window"
+msgstr "Suavizar a rolagem de mensagens na janela de conversação"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"A lista de cores que serão usadas para os apelidos nas salas de conferência."
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
+"aba."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
+"vazia significa que nós nunca devemos mostrar o diálogo."
+
+#: ../src/common/config.py:256
+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 ""
+"Se Verdadeiro, você poderá especificar uma prioridade negativa para a sua "
+"conta na janela de modificação da conta. CUIDADO, quando você estiver "
+"autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
+"mensagem do seu servidor."
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Se Verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
+"as senhas das contas."
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Se Verdadeiro, o Gajim mostrará o número de contatos online e do total de "
+"contatos nas linha de conta e grupo."
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
+"recebidas como se elas fossem do tipo especificado"
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
+"última mensagem, se a janela de conversa ainda não estiver aberta."
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Se definido como Verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
+"imagem usando o dvips antes de inseri-la em uma janela de conversa."
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"O tempo de inatividade necessário antes de fechar a janela de alteração de "
+"status."
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Número máximo de linhas que são exibidas em conversações. As linhas mais "
+"antigas são apagadas."
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
+"serão anexadas ao ícone da bandeja do sistema."
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"A prioridade será alterada automaticamente de acordo com o o seu status. As "
+"prioridades são definidas nas opções autopriority_."
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 rodando"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+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:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "O OpenPGP está ativado para este contato?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+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:400
+msgid "all or space separated status"
+msgstr "todos ou lista de status separados por espaço"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'sim', 'não' ou 'ambos'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'sim', 'não', ou ''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Dormindo"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Volto logo"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Volto em alguns minutos."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Comendo"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Eu estou comendo, então deixe-me uma mensagem."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Filme"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Estou assistindo um filme."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Trabalhando"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Estou trabalhando."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefone"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Estou no telefone."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Estou fora"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "Estou fora curtindo a vida."
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "Estou disponível."
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "Estou livre para conversar."
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Estou de volta."
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "Não estou disponível."
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Não perturbe."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Tchau!"
+
+#: ../src/common/config.py:441
+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 ""
+"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:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "verde"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "mantimento"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "humano"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marinho"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Incapaz de carregar o módulo inativo"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "Servidor errado"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr "Endereço local inválido? :-O"
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "A informação do registo para o transporte %s não chegou a tempo"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr "Erro de Escrita em Disco"
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Extensão não suportada"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Apelido não permitido: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "Impossível ingressar na sala"
+
+#: ../src/common/connection_handlers.py:2054
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Você está banido da sala %s."
+
+#: ../src/common/connection_handlers.py:2057
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "A sala %s não existe."
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "A criação de sala é restrita."
+
+#: ../src/common/connection_handlers.py:2063
+#, 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:2067
+#, 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:2109
+msgid "Room has been destroyed"
+msgstr "A sala foi excluída"
+
+#: ../src/common/connection_handlers.py:2116
+#, 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:2143
+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:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "nós estamos agora inscritos para %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Remoção de Inscrição solicitada por %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "nós estamos agora sem inscrição para %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"O JID %s não é uma compilação da RFC. Não se adicionará a sua lista.  Use "
+"ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
+"removê-lo"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Palavra-chave do OpenPGP não foi recebida"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Você será conectado ao %s sem OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Incapaz de carregar o módulo inativo"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+#, fuzzy
+msgid "CRL is not yet valid"
+msgstr "%s não é um nível de gravação (loglevel) válido"
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Nome de usuário inválido"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Conexão com a conta \"%s\" foi perdida"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Reconecte manualmente."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "O servidor %s respondeu erroneamente à requisição de registro: %s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Resposta inválida"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporte %s respondeu errado para registar o pedido: %s"
+
+#: ../src/common/connection.py:522
+msgid "Connection to proxy failed"
+msgstr "Falha na conexão com o proxy"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Impossível conectar a \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Verifique sua conexão ou tente novamente mais tarde."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Impossível conectar a \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Conexão com a conta \"%s\" foi perdida"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Verifique sua conexão ou tente novamente mais tarde"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Falha na autenticação com \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Por favor, verifique seu login e senha para exatidão."
+
+#: ../src/common/connection.py:800
+msgid "Error while removing privacy list"
+msgstr "Erro ao remover lista de privacidade"
+
+#: ../src/common/connection.py:801
+#, 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 ""
+"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:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Esta mensagem está *criptografada* (Veja:JEP:'27')]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Assunto: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Não baixado por causa do status invisível"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observadores"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/common/contacts.py:356
+msgid "Not in roster"
+msgstr "Fora da lista"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+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:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "O pysqlite2 (ou python-pysqlite2) está faltando. Encerrando..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Nome da conta não pode ser vazio."
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Serviço não disponível: o Gajim não está funcionando ou o controle remoto é "
+"falso"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"O D-Bus não está presente nesta máquina ou o módulo do Python está faltando"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"O bus de sessão não está disponível.\n"
+"Veja http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "um"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "dois"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "três"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "quatro"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "cinco"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "seis"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "sete"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "oito"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "nove"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "dez"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "onze"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "doze"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 horas"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "$0 e cinco"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "$0 e dez"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "$0 e quinze"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "$0 e vinte"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "$0 e vinte e cinco"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "$0 e meia"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "vinte e cinco para as $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "vinte para as $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "quinze para as $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "dez para as $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "cinco para as $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 horas"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Noite"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Madrugada"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Manhã"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Quase meio-dia"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Meio-dia"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Tarde"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Noite"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Tarde da noite"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Começo da semana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Meio da semana"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Fim da semana"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Final de semana!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Caracter inválido no nome do usuário"
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Endereço do servidor é requerido."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Caracter inválido no nome do host"
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Caracter inválido no recurso."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Ocupado"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Ocupado"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Não Disponível"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "Livre para _Conversa"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Livre para Conversa"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "Dis_ponível"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Disponível"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Conectando"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Afastado"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Desconectado"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Invisível"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?contato tem status:Desconhecido"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?contato tem status:Com erros"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Inscrição existente:Nenhuma"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Para"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Ambos"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Pergunta (para Inscrição):Nenhuma"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Inscrever"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderadores"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderador"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Participantes"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Participante"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Visitantes"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Visitante"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Filiação do Contato de Conferência:Nenhuma"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "Dono"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "Membro"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "está prestando a atenção na conversa"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "está fazendo outra coisa"
+
+#: ../src/common/helpers.py:405
+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:408
+msgid "paused composing a message"
+msgstr "parou de digitar"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "fechou a janela de conversa ou aba"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d mensagem pendente"
+msgstr[1] "%s mensagens pendentes"
+
+#: ../src/common/helpers.py:1005
+#, python-format
+msgid " from room %s"
+msgstr " da sala %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, python-format
+msgid " from user %s"
+msgstr " do usuário %s"
+
+#: ../src/common/helpers.py:1010
+#, python-format
+msgid " from %s"
+msgstr " de %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, 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:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "erro: impossível abrir %s para leitura"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "azul celeste"
+
+#: ../src/common/optparser.py:341
+msgid "migrating logs database to indices"
+msgstr "migrando base de dados de registros para índices"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Conta %s do Gajim"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pausa"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Negrito"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Possui"
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Conversas"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Negrito"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Índices"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Completo"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Índices"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Desativado"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "URI"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Deletar"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "Desconectado"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Desabilitado"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Desabilitado"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Ativado"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Computador:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "mensagem"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Ativado"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Invisível"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "um"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Computador:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "Alemão"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Modificar"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Desconectado"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupo"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "onze"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Parado"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Modificado:"
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Apelido"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Dormindo"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Rua:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Inscrito"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tempo"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "nove"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Servidor errado"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Noite"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Compôr"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Manhã"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "todos no grupo"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Trabalhando"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Noite"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Chutando %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Ingressar"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Trabalhando"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Trabalhando"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "sala"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Comendo"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Mudando Assunto"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Chutando %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Comendo"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Trabalhando"
+
+#: ../src/common/pep.py:161
+msgid "Relaxing"
+msgstr ""
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Chutando %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Comendo"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "_Desconectar"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Comendo"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Razão"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Razão"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Dormindo"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Trabalhando"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Comendo"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Estou assistindo um filme."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Comendo"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Estou no telefone."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Transferindo"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Compôr"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "Conectado"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Abrir como _Link"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Trabalhando"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Compôr"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Trabalhando"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Impossível conectar à porta %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Talvez haja uma outra instância do Gajim em execução. A Transferência de "
+"Arquivos será cancelada."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"A conexão ao computador não pode ser estabelecida: tempo excedido ao "
+"transmitir os dados."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"O computador %s que você especificou na configuração avançada "
+"ft_override_host_to_send não é válido e será ignorado."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Para continuar enviando e recebendo mensagens, você precisará reconectar."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Erro do Avahi"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Mensagens link-local podem não funcionar adequadamente."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Por favor verifique se o Avahi está instalado."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "Impossível iniciar o serviço local"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Impossível conectar-se à porta %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+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:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Impossível alterar status da conta \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Você não está conectado ou não está visível aos outros. Sua mensagem não "
+"pode ser enviada."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Esta mensagem está criptografada]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "O contato está offline. Sua mensagem não pode ser enviada."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+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/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Erro ao adicionar serviço. %s"
+
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../src/config.py:293
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:301
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:407
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Mensagens de Status Padrão"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Habilitar"
+
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Sempre usar as aplicações padrões do OS/X"
 
-#: ../src/config.py:408
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../src/config.py:638 ../src/dialogs.py:1018
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, 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:639
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2910,103 +5857,105 @@ 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:1001
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1001
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:1037
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Primeira Mensagem Recebida"
 
-#: ../src/config.py:1038
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
 msgstr "Nova Mensagem Recebida"
 
-#: ../src/config.py:1039
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Nova Mensagem Recebida"
+
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Contato Conectado"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Contato Desconectou"
 
-#: ../src/config.py:1041
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Mensagem Enviada"
 
-#: ../src/config.py:1042
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem Destacada de Conferência"
 
-#: ../src/config.py:1043
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Mensagem de Conferência Recebida"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Email do Gmail Recebido"
 
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1517 ../src/dialogs.py:1581
-#: ../src/disco.py:743 ../src/disco.py:1569 ../src/disco.py:1815
-#: ../src/history_window.py:113
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1425 ../src/common/config.py:393
-msgid "Be right back."
-msgstr "Estou de volta."
-
-#: ../src/config.py:1429
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1430
+#: ../src/config.py:1406
 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:1525 ../src/config.py:1616
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1652 ../src/config.py:1693
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1653
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1679
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1694
 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:1689
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1690
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1694
+#: ../src/config.py:1710
 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:1700
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1701
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -3014,147 +5963,147 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1705 ../src/config.py:1709
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1774
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Renomear Conta"
 
-#: ../src/config.py:1775
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:1793 ../src/config.py:1801 ../src/config.py:1841
-#: ../src/config.py:3048 ../src/dataforms_widget.py:533
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1802
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuário@nomedoservidor\"."
 
-#: ../src/config.py:1988 ../src/config.py:3119
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1989 ../src/config.py:3120
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2010
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2014
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de Chave OpenPGP"
 
-#: ../src/config.py:2015
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2056
+#: ../src/config.py:2089
 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:2063 ../src/dialogs.py:1364 ../src/dialogs.py:1505
-#: ../src/dialogs.py:1685 ../src/disco.py:427 ../src/profile_window.py:318
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:2064
+#: ../src/config.py:2097
 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:2068
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2069
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2100
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2134
 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:2277
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2315
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Lista de Banidos"
 
-#: ../src/config.py:2316
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Lista de Membros"
 
-#: ../src/config.py:2317
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Lista de Donos"
 
-#: ../src/config.py:2318
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Lista de Administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2367 ../src/disco.py:750 ../src/history_manager.py:160
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Lista"
 
-#: ../src/config.py:2409
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2411
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -3162,11 +6111,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Adicionando Membro..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -3174,11 +6123,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Adicionando Proprietário..."
 
-#: ../src/config.py:2417
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -3186,11 +6135,11 @@ msgstr ""
 "<b>Quem você quer tornar um dono?</b>\n"
 "\n"
 
-#: ../src/config.py:2419
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Adicionando Administrador..."
 
-#: ../src/config.py:2420
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -3198,7 +6147,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2421
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3214,85 +6163,85 @@ msgstr ""
 "4. domínio (o domínio combina por si com qualquer usuario@domínio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
 
-#: ../src/config.py:2525
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2540 ../src/gajim.py:1343 ../src/roster_window.py:3455
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2541 ../src/roster_window.py:3451
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2542 ../src/roster_window.py:3456
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2556
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2649
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:2651
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Nova Conferência"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2754
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este bookmark"
 
-#: ../src/config.py:3031
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3033
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Duplicado"
 
-#: ../src/config.py:3060
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta já está configurada no Gajim."
 
-#: ../src/config.py:3077
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3078 ../src/config.py:3223
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3302,260 +6251,296 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no menu Editar da janela "
 "principal."
 
-#: ../src/config.py:3095
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3138
 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:3202 ../src/config.py:3241
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Contato já foi adicionado à  lista"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3222
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3325
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3326
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:454
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a última vez onde você "
 "prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:552
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:564
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:569
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:585
+#: ../src/conversation_textview.py:712
 #, 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:598
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Abrir como _Link"
 
-#: ../src/conversation_textview.py:1073
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1077
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1111
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:537
+#: ../src/dataforms_widget.py:540
 msgid "Jabber ID already in list"
 msgstr "Jabber ID já existente na lista"
 
-#: ../src/dataforms_widget.py:538
+#: ../src/dataforms_widget.py:541
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "O Jabber ID que você forneceu já está na lista. Escolha outro."
 
 #. Default jid
-#: ../src/dataforms_widget.py:549
+#: ../src/dataforms_widget.py:552
 msgid "new@jabber.id"
 msgstr "novo@jabber.id"
 
-#: ../src/dataforms_widget.py:552 ../src/dataforms_widget.py:554
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novo%d@jabber.id"
 
-#: ../src/dialogs.py:71
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contato: <i>%s</i>"
 
-#: ../src/dialogs.py:73
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:223
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:330
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:335
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Nome do Contato"
 
-#: ../src/dialogs.py:381
+#: ../src/dialogs.py:461
+msgid "Set Mood"
+msgstr ""
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/dialogs.py:383
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:483
-msgid "Save as Preset Status Message"
-msgstr "Salvar como a mensagem de status pré-configurada"
-
-#: ../src/dialogs.py:484
-msgid "Please type a name for this status message"
-msgstr "Por favor, escreva um nome para esta mensagem de status"
-
-#: ../src/dialogs.py:495
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever Mensagem de Status?"
 
-#: ../src/dialogs.py:496
+#: ../src/dialogs.py:673
 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:512
+#: ../src/dialogs.py:682
+msgid "Save as Preset Status Message"
+msgstr "Salvar como a mensagem de status pré-configurada"
+
+#: ../src/dialogs.py:683
+msgid "Please type a name for this status message"
+msgstr "Por favor, escreva um nome para esta mensagem de status"
+
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:516
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:553
+#: ../src/dialogs.py:729
 #, 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:555
+#: ../src/dialogs.py:731
 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:712 ../src/dialogs.py:718
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Eu gostaria de adiciona-lo à  minha lista."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à  lista"
 
-#: ../src/dialogs.py:734
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:770
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID do Usuário:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:848
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Desenvolvedores Atuais:"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Desenvolvedores Passados:"
 
-#: ../src/dialogs.py:860
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:866
+#: ../src/dialogs.py:1035
 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:879
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:1011
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossível conectar à porta %s."
-
-#: ../src/dialogs.py:1012
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Talvez haja uma outra instância do Gajim em execução. A Transferência de "
-"Arquivos será cancelada."
-
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -3568,80 +6553,90 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1293
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:1296
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:1357 ../src/roster_window.py:776
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:1365
+#: ../src/dialogs.py:1686
 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:1383
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:1453 ../src/dialogs.py:1459
-#: ../src/groupchat_control.py:1683
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Apelido inválido"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+msgid "The nickname has not allowed characters."
+msgstr "O apelido possui caracteres não permitidos."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:1454 ../src/dialogs.py:1460
-#: ../src/groupchat_control.py:1684
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 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:1466
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:1467
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:1506
+#: ../src/dialogs.py:1822
 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:1520
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:1553
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:1554
+#: ../src/dialogs.py:1870
 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:1578
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:1636
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:1638
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:1639
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3650,290 +6645,376 @@ msgstr ""
 "você quer enviar uma messagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1664 ../src/dialogs.py:2040 ../src/dialogs.py:2181
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:1665 ../src/dialogs.py:2041 ../src/dialogs.py:2182
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, 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:1674 ../src/dialogs.py:1677
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:1704
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:1709
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:1710
+#: ../src/dialogs.py:2025
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1752 ../src/notify.py:232 ../src/notify.py:447
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:1754 ../src/notify.py:240 ../src/notify.py:449
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:1756 ../src/notify.py:263 ../src/notify.py:451
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1756 ../src/notify.py:244 ../src/notify.py:451
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
 #. private message
-#: ../src/dialogs.py:1757 ../src/notify.py:251 ../src/notify.py:452
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:1757 ../src/gajim.py:1532 ../src/notify.py:460
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Novo E-Mail"
 
-#: ../src/dialogs.py:1759 ../src/gajim.py:1707 ../src/notify.py:454
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
-#: ../src/dialogs.py:1761 ../src/gajim.py:1504 ../src/gajim.py:1674
-#: ../src/notify.py:456
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:1763 ../src/gajim.py:1746 ../src/gajim.py:1768
-#: ../src/gajim.py:1785 ../src/notify.py:458
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:1764 ../src/gajim.py:1749 ../src/notify.py:458
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:1766 ../src/gajim.py:1364 ../src/notify.py:462
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Convite para Conferência"
 
-#: ../src/dialogs.py:1768 ../src/notify.py:224 ../src/notify.py:464
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "O Contato Alterou seu Status"
 
-#: ../src/dialogs.py:1959
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples usando conta %s"
 
-#: ../src/dialogs.py:1961
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples na conta %s"
 
-#: ../src/dialogs.py:1963
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1966
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1989
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2012
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2082
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2083
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2127
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:2129
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2252
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de Privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de Privacidade para %s"
 
-#: ../src/dialogs.py:2312
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordem: %s, ação: %s tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:2315
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %s, ação: %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de Privacidade para %s"
 
-#: ../src/dialogs.py:2542
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Listas de Privacidade"
 
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Nome de Lista Inválido"
 
-#: ../src/dialogs.py:2613
+#: ../src/dialogs.py:2931
 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:2650
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "Você não entrou em uma sala."
+
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:2652
+#: ../src/dialogs.py:2968
 #, 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:2665
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2731
+#: ../src/dialogs.py:2978
+#, fuzzy
+msgid "Do you want to accept the invitation?"
+msgstr "Você quer enviar esse arquivo para %s:"
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2741 ../src/dialogs.py:2792
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:2746
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2779
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:2797
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2862
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:2864
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando Notificação Especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:2935
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2941
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:3059
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "quando eu estiver"
 
-#: ../src/disco.py:111
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Outros"
 
-#: ../src/disco.py:112 ../src/disco.py:113 ../src/disco.py:1355
-#: ../src/gajim.py:660 ../src/roster_window.py:295 ../src/roster_window.py:355
-#: ../src/roster_window.py:395 ../src/roster_window.py:503
-#: ../src/roster_window.py:535 ../src/roster_window.py:537
-#: ../src/roster_window.py:4755 ../src/roster_window.py:4757
-#: ../src/common/contacts.py:295 ../src/common/contacts.py:310
-#: ../src/common/helpers.py:53
-msgid "Transports"
-msgstr "Transportes"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:115
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:428
+#: ../src/disco.py:440
 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:502
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviços usando conta %s"
 
-#: ../src/disco.py:504
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Buscar Serviços"
 
-#: ../src/disco.py:644
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:645
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3941,202 +7022,208 @@ 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:649 ../src/disco.py:930
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:650
+#: ../src/disco.py:662
 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:730
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Servidor inválido"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Visualizando %s usando conta %s"
 
-#: ../src/disco.py:769
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:931
+#: ../src/disco.py:956
 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:1152
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Executar Comando"
 
-#: ../src/disco.py:1162 ../src/disco.py:1360
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1397
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d"
 
 #. Users column
-#: ../src/disco.py:1579
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1587
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1595
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1824
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:1832
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:1901
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: ../src/features_window.py:47
+#: ../src/features_window.py:51
 msgid "PyOpenSSL"
 msgstr "PyOpenSSL"
 
-#: ../src/features_window.py:48
+#: ../src/features_window.py:52
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Uma biblioteca usada para validar os certificados do servidor para garantir "
 "uma conexão segura."
 
-#: ../src/features_window.py:49 ../src/features_window.py:50
+#: ../src/features_window.py:53 ../src/features_window.py:54
 msgid "Requires python-pyopenssl."
 msgstr "Requer o python-pyopenssl."
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:55
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:56
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Conversa sem servidor com clientes detectados automaticamente em uma rede "
 "local."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:57
 msgid "Requires python-avahi."
 msgstr "Requer o python-avahi."
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:58
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requer pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:59
 msgid "gajim-remote"
 msgstr "gajim-remote"
 
-#: ../src/features_window.py:56
-msgid "A script to controle gajim via commandline."
+#: ../src/features_window.py:60
+#, fuzzy
+msgid "A script to control Gajim via commandline."
 msgstr "Um script para controlar o Gajim via linha de comando."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:61
 msgid "Requires python-dbus."
 msgstr "Requer o python-dbus."
 
-#: ../src/features_window.py:58 ../src/features_window.py:62
-#: ../src/features_window.py:66 ../src/features_window.py:70
-#: ../src/features_window.py:74 ../src/features_window.py:82
-#: ../src/features_window.py:86 ../src/features_window.py:98
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Recurso não disponível no Windows."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:63
 msgid "OpenGPG"
 msgstr "OpenGPG"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:64
 msgid "Encrypting chatmessages with gpg keys."
 msgstr "Criptografando as mensagens das conversas com chaves PGP."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:65
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requer gpg e python-GnuPGInterface."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:67
 msgid "network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:68
 msgid "Autodetection of network status."
 msgstr "Detecção automática do status da rede."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:69
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requer gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:71
 msgid "Session Management"
 msgstr "Gerenciamento de Sessão"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:72
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "A sessão do Gajim é armazenada no logout and restaurada no login."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:73
 msgid "Requires python-gnome2."
 msgstr "Requer python-gnome2."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:75
 msgid "gnome-keyring"
 msgstr "gnome-keyring"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:76
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "As senhas podem ser armazenadas de maneira segura e não apenas em texto "
 "plano."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:77
 msgid "Requires gnome-keyring and python-gnome2-desktop."
 msgstr "Requer gnome-keyring e python-gnome2-desktop."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:79
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:80
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:81
 msgid "Requires dnsutils."
 msgstr "Requer dnsutils."
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:82
 msgid "Requires nslookup to use SRV records."
 msgstr "Requer nslookup para usar registros SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:83
 msgid "Spell Checker"
 msgstr "Verificador Ortográfico"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:84
 msgid "Spellchecking of composed messages."
 msgstr "Verificação ortográfica das mensagens escritas."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:85
 msgid ""
 "Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
 "sources."
@@ -4144,15 +7231,15 @@ msgstr ""
 "Requer python-gnome2-extras ou a compilação do módulo gtkspell a partir dos "
 "fontes do Gajim."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:87
 msgid "Notification-daemon"
 msgstr "Notification-daemon"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:88
 msgid "Passive popups notifying for new events."
 msgstr "Popups passivos notificando novos eventos."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:89
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -4160,72 +7247,84 @@ msgstr ""
 "Requer python-notify ou então python-dbus em conjunto com notification-"
 "daemon."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:91
 msgid "Trayicon"
 msgstr "Ícone da Bandeja"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:92
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Um ícone na bandeja do sistema refletindo a presença atual."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:93
+#, fuzzy
 msgid ""
-"Requires python-gnome2-extras or compiled  trayicon module from Gajim "
-"sources."
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Requer python-gnome2-extras ou módulo trayicon compilado a partir dos fontes "
 "do Gajim."
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:94
 msgid "Requires PyGTK >= 2.10."
 msgstr "Requer PyGTK >= 2.10."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:95
 msgid "Idle"
 msgstr "Ocioso"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:96
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Habilidade de medir o tempo de inatividade para definir o status automático."
 
-#: ../src/features_window.py:93 ../src/features_window.py:94
+#: ../src/features_window.py:97 ../src/features_window.py:98
 msgid "Requires compilation of the idle module from Gajim sources."
 msgstr "Requer a compilação do módulo idle a partir dos fontes do Gajim."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:99
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:96
-msgid "Transform LaTeX espressions between $$ $$."
+#: ../src/features_window.py:100
+#, fuzzy
+msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Tranforma expressões LaTeX entre $$ $$."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:101
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Requer textlive-latex-base, dvips e imagemagick. Você tem que definir a "
+"opção 'use_latex' para Verdadeiro no Editor de Configurações Avançadas."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Requer textlive-latex-base, dvips e imagemagick. Você tem que definir a "
 "opção 'use_latex' para Verdadeiro no Editor de Configurações Avançadas."
 
-#: ../src/features_window.py:99
-msgid "End to end encryption"
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
 msgstr "Criptografia end to end"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:104
 msgid "Encrypting chatmessages."
 msgstr "Criptografando mensagens."
 
-#: ../src/features_window.py:101 ../src/features_window.py:102
+#: ../src/features_window.py:105 ../src/features_window.py:106
 msgid "Requires python-crypto."
 msgstr "Requer python-crypto."
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:107
 msgid "RST Generator"
 msgstr "Gerador RST"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:108
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -4233,143 +7332,140 @@ msgstr ""
 "Gera saída XHTML a partir de código RST (veja http://docutils.sourceforge."
 "net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:109 ../src/features_window.py:110
 msgid "Requires python-docutils."
 msgstr "Requer python-docutils."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:111
 msgid "libsexy"
 msgstr "libsexy"
 
-#: ../src/features_window.py:108
-msgid "Ability to have clickable URLs in chat window."
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Habilidade de ter URL's clicáveis na janela de conversa."
 
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:113 ../src/features_window.py:114
 msgid "Requires python-sexy."
 msgstr "Requer python-sexy."
 
-#: ../src/features_window.py:117 ../src/common/helpers.py:248
-msgid "Available"
-msgstr "Disponível"
-
-#: ../src/features_window.py:124
+#: ../src/features_window.py:128
 msgid "Feature"
 msgstr "Recurso"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:165 ../src/filetransfers_window.py:305
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:174 ../src/filetransfers_window.py:184
-#: ../src/history_manager.py:468
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:175
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:593
-#: ../src/tooltips.py:592
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:187
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
 
-#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:210
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Conexão ponto a ponto não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Conteúdo: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/filetransfers_window.py:222
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
-#: ../src/filetransfers_window.py:243
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Escolha o Arquivo para Enviar..."
 
-#: ../src/filetransfers_window.py:259 ../src/tooltips.py:631
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:271
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:324 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: ../src/filetransfers_window.py:325 ../src/gtkgui_helpers.py:775
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -4377,31 +7473,33 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/filetransfers_window.py:344 ../src/gtkgui_helpers.py:789
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: ../src/filetransfers_window.py:344 ../src/gtkgui_helpers.py:790
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório"
 
-#: ../src/filetransfers_window.py:354
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Salvar Arquivo como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:434
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -4409,65 +7507,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:523
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:563 ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:563
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Arquivo:"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:589 ../src/tooltips.py:582
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:591 ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:779
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:83
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s não é um nível de gravação (loglevel) válido"
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:156
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 
-#: ../src/gajim.py:156
+#: ../src/gajim.py:186
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "O Gajim necessita do PyGTK 2.8 ou superior"
 
-#: ../src/gajim.py:157
+#: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.8 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:159
+#: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "O Gajim necessita do GTK 2.8 ou superior"
 
-#: ../src/gajim.py:160
+#: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.8 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:165
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:167
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -4476,22 +7574,22 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:169
+#: ../src/gajim.py:199
 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:174
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#: ../src/gajim.py:182
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa do pywin32 para rodar"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -4501,11 +7599,11 @@ msgstr ""
 "pode obtê-lo em %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -4513,280 +7611,252 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim.py:352 ../src/common/connection_handlers.py:908
-#: ../src/common/connection_handlers.py:1620
-#: ../src/common/connection_handlers.py:1649
-#: ../src/common/connection_handlers.py:1659
-#: ../src/common/connection_handlers.py:1678
-#: ../src/common/connection_handlers.py:1915
-#: ../src/common/connection_handlers.py:2027 ../src/common/connection.py:939
-msgid "Disk Write Error"
-msgstr "Erro de Escrita em Disco"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Frase de acesso é obrigatória"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Entre com a frase de acesso da chave GPG para conta %s"
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Frase de acesso Errada"
 
-#: ../src/gajim.py:448
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, reescreva sua frase de segurança GPG ou pressione Cancelar."
+
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"O apelido que você deseja usar está em uso ou registado por um outro "
+"ocupante.\n"
+"Por favor, especifique um outro apelido abaixo:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gajim.py:450
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: ../src/gajim.py:453
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorização HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:500 ../src/notify.py:466
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Falha na Conexão"
 
-#: ../src/gajim.py:834
-#, python-format
-msgid "Subject: %s"
-msgstr "Assunto: %s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:881 ../src/gajim.py:894
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro no envio %s ( %s )"
 
-#: ../src/gajim.py:927
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:928
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: ../src/gajim.py:936
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:937
-msgid "You will always see him or her as offline."
-msgstr "Você sempre o verá como offline."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:981
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:982 ../src/common/connection.py:465
-msgid "Check your connection or try again later."
-msgstr "Verifique sua conexão ou tente novamente mais tarde."
-
-#: ../src/gajim.py:1151 ../src/groupchat_control.py:991
-#, python-format
-msgid "%s is now known as %s"
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/gajim.py:1167 ../src/roster_window.py:1372
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s agora está %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s agora está %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1170 ../src/groupchat_control.py:1142
-#: ../src/roster_window.py:1375
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s agora está %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1291 ../src/groupchat_control.py:951
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
-#: ../src/gajim.py:1294
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "A sala agora mostra membros indisponíveis"
 
-#: ../src/gajim.py:1296
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: ../src/gajim.py:1299
+#: ../src/gajim.py:1377
 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_contol.py)
-#: ../src/gajim.py:1302
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "A gravação das conversas da sala está ativo agora"
 
-#: ../src/gajim.py:1304
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "A gravação das conversas da sala está desligado agora"
 
-#: ../src/gajim.py:1306
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: ../src/gajim.py:1309
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: ../src/gajim.py:1312
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: ../src/gajim.py:1344
-#, python-format
-msgid "A Password is required to join the room %s. Please type it"
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
 msgstr "Uma Senha é requerida para ingressar na sala %s. Por favor, digite-a"
 
-#: ../src/gajim.py:1379
-msgid "Your passphrase is incorrect"
-msgstr "Sua frase de acesso está incorreta"
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:1392 ../src/secrets.py:44
-msgid "Passphrase Required"
-msgstr "Frase de acesso é obrigatória"
-
-#: ../src/gajim.py:1393
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Entre com a frase de acesso da chave GPG para conta %s"
-
-#: ../src/gajim.py:1405
-msgid "Wrong Passphrase"
-msgstr "Frase de acesso Errada"
-
-#: ../src/gajim.py:1406
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, reescreva sua frase de segurança GPG ou pressione Cancelar."
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:1515
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1517
+#: ../src/gajim.py:1563
 #, 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"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1526
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"De: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1704
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/gajim.py:1769
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1773
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: ../src/gajim.py:1786
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1790
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s to %(name)s parado."
 
-#: ../src/gajim.py:1885
-msgid "Session negotiation cancelled"
-msgstr "Negociação da sessão cancelada"
-
-#: ../src/gajim.py:1886
-#, python-format
-msgid "The client at %s cancelled the session negotiation."
-msgstr "O cliente em %s cancelou a negociação da sessão."
-
-#: ../src/gajim.py:1927 ../src/gajim.py:1971
-msgid "Confirm these session options"
-msgstr "Confirme essas opções de sessão"
-
-#: ../src/gajim.py:1928
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
-"\n"
-"\t\t%s\n"
-"\n"
-"\t\tAre these options acceptable?"
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
 msgstr ""
-"O cliente remoto quer negociar uma sessão com esses recursos:\n"
-"\n"
-"\t\t%s\n"
-"\n"
-"\t\tEssas opções são aceitáveis?"
 
-#: ../src/gajim.py:1972
-#, python-format
-msgid ""
-"The remote client selected these options:\n"
-"\n"
-"%s\n"
-"\n"
-"Continue with the session?"
-msgstr ""
-"O cliente remoto selecionou essas opções:\n"
-"\n"
-"%s\n"
-"\n"
-"Continuar com a sessão?"
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Em todas as _mensagens"
 
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gajim.py:2098
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Por favor digite um novo nome de usuário para sua conta local"
 
-#: ../src/gajim.py:2115
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Erro."
 
-#: ../src/gajim.py:2154
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Conflito de Recurso"
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -4794,51 +7864,143 @@ msgstr ""
 "Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
 "novo"
 
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Conexão"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr ""
+"Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "_Não me pergunte novamente"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Criptografia desabilitada"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2521
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#. sorted alphanum
-#: ../src/gajim.py:2657 ../src/common/config.py:102
-#: ../src/common/config.py:413 ../src/common/optparser.py:206
-#: ../src/common/optparser.py:424 ../src/common/optparser.py:458
-msgid "default"
-msgstr "padrão"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bookmark já configurado"
 
-#: ../src/gajim.py:2743
-msgid "Network Manager support not available"
-msgstr "Não há suporte disponível para o Network Manager"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "A sala \"%s\" já existe nos favoritos."
 
-#: ../src/gajim.py:2848
-msgid "Session Management support not available (missing gnome.ui module)"
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark foi adicionado com sucesso"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
-"Suporte de gerenciamento da sessão não disponível (faltando o módulo gnome."
-"ui)"
+"Você pode gerenciar seus bookmarks pelo menu de Ações na janela principal."
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Mostra uma ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:76
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "mostrar ajuda no comando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Mostrar ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -4846,48 +8008,48 @@ msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: ../src/gajim-remote.py:92 ../src/gajim-remote.py:107
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:153
-#: ../src/gajim-remote.py:174 ../src/gajim-remote.py:204
-#: ../src/gajim-remote.py:213 ../src/gajim-remote.py:220
-#: ../src/gajim-remote.py:227 ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "mostrar somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível"
 
-#: ../src/gajim-remote.py:106 ../src/gajim-remote.py:127
-#: ../src/gajim-remote.py:141 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4896,21 +8058,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
 "contato"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:128
 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 "
@@ -4920,30 +8082,30 @@ msgstr ""
 "são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP', apenas configure a 'chave para ''."
 
-#: ../src/gajim-remote.py:126 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:141
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: ../src/gajim-remote.py:130 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:141
 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 "
@@ -4953,136 +8115,136 @@ msgstr ""
 "conta são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP, apenas configure a 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "assunto"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Envia uma nova messagem para uma conferência em que você tiver ingressado."
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:173
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletado"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Adicionar contato para a lista"
 
-#: ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Adicionar novo contato para esta conta"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Retorna a mensagem de status atual (global a menos que a conta for "
 "especificada)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Retorna o número das mensagens não lidas"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abrir o diálogo 'Iniciar Conversa'"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa, usando esta conta"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Envia XML personalizado"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -5090,35 +8252,74 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Manipular uma URI xmpp:/"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+#, fuzzy
+msgid "Account in which you want to handle it"
+msgstr "Selecione a conta que você quer sincronizar"
+
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Entrar em uma sala MUC"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "sala"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Sala:"
+
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "apelido"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Apelido não encontrado: %s"
+
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "senha"
 
-#: ../src/gajim-remote.py:285
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Senhas não conferem"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Account from which you want to enter the room"
+msgstr "Selecione a conta que você quer sincronizar"
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Mostrar ou esconder a janela principal"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote.py:304
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -5127,29 +8328,31 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:371
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uso: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:374
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:378
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:382
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -5158,170 +8361,196 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:455
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Muitos argumentos.\n"
 "Digite \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:459
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Tipo \"%s ajuda %s\" para maiores informações"
 
-#: ../src/gajim-remote.py:477
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "URI incorreta"
 
-#: ../src/gajim_themes_window.py:67
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
-#: ../src/gajim_themes_window.py:105
+#: ../src/gajim_themes_window.py:97
 msgid "You cannot make changes to the default theme"
 msgstr "Você não pode fazer alterações no tema padrão"
 
-#: ../src/gajim_themes_window.py:106
+#: ../src/gajim_themes_window.py:98
 msgid "Please create a clean new theme with your desired name."
 msgstr "Crie um novo tema com o nome que você desejar."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:180
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:197
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Você não pode apagar o seu tema corrente"
 
-#: ../src/gajim_themes_window.py:198
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:139
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:141
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, fuzzy, python-format
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Você não está mais na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:350
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Inserir Apelido"
 
-#: ../src/groupchat_control.py:878
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Histórico de Conversação"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Conexão"
+
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Enviar o arquivo mesmo?"
 
-#: ../src/groupchat_control.py:879
+#: ../src/groupchat_control.py:1028
 #, 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."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:956
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:959
+#: ../src/groupchat_control.py:1132
 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:965
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:969
+#: ../src/groupchat_control.py:1142
 #, 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:976
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:980
+#: ../src/groupchat_control.py:1153
 #, 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:989
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1025 ../src/groupchat_control.py:1029
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1026
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1135
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s foi chutado: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1253 ../src/groupchat_control.py:1532
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../src/groupchat_control.py:1254 ../src/groupchat_control.py:1533
-msgid "The nickname has not allowed characters."
-msgstr "O apelido possui caracteres não permitidos."
-
-#: ../src/groupchat_control.py:1277 ../src/groupchat_control.py:1295
-#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Esta conferência não tem assunto"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 
-#: ../src/groupchat_control.py:1459
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -5334,7 +8563,7 @@ msgstr ""
 "estiver atualmente na sala, ele/ela será chutado também.  NÃO suporta "
 "espaços no apelido."
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -5343,7 +8572,7 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada com um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1472
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -5352,7 +8581,7 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1478
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -5361,7 +8590,7 @@ msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à  sala atual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1482
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -5370,7 +8599,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1486
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -5380,7 +8609,7 @@ msgstr ""
 "Uso: /%s <apelido> [razão], remove da sala o ocupante especificado pelo "
 "apelido e indica opcionalmente uma razão.  Não suporta espaços no apelido."
 
-#: ../src/groupchat_control.py:1495
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -5389,65 +8618,61 @@ msgstr ""
 "Uso: /%s <apelido> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1511
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <mensagem>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1606
+#: ../src/groupchat_control.py:1837
 #, 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:1608
+#: ../src/groupchat_control.py:1839
 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:1612 ../src/roster_window.py:4902
-msgid "Do _not ask me again"
-msgstr "_Não me pergunte novamente"
-
-#: ../src/groupchat_control.py:1644
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Mudando Assunto"
 
-#: ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1654
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Mudando Apelido"
 
-#: ../src/groupchat_control.py:1655
+#: ../src/groupchat_control.py:1882
 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:1670
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1671
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -5455,40 +8680,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Você também pode entrar um ponto de encontro alternativo:"
 
-#: ../src/groupchat_control.py:1705
-msgid "Bookmark already set"
-msgstr "Bookmark já configurado"
-
-#: ../src/groupchat_control.py:1706
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "A sala \"%s\" já existe nos favoritos."
-
-#: ../src/groupchat_control.py:1715
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark foi adicionado com sucesso"
-
-#: ../src/groupchat_control.py:1716
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Você pode gerenciar seus bookmarks pelo menu de Ações na janela principal."
-
 #. ask for reason
-#: ../src/groupchat_control.py:1868
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1869 ../src/groupchat_control.py:2169
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2168
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -5503,91 +8710,91 @@ msgid ""
 "nonetheless."
 msgstr "Não é provavelmente fatal, mas deve ser reportado aos programadores."
 
-#: ../src/gtkexcepthook.py:53
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Reportar Erro"
 
-#: ../src/gtkexcepthook.py:76
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:162 ../src/gtkgui_helpers.py:177
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:347
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:350
+#: ../src/gtkgui_helpers.py:359
 msgid "Error parsing file:"
 msgstr "Erro ao analisar gramaticalmente o arquivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:387
+#: ../src/gtkgui_helpers.py:396
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Não foi possível escrever à  %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:719
+#: ../src/gtkgui_helpers.py:733
 msgid "Gajim is not the default Jabber client"
 msgstr "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:720
+#: ../src/gtkgui_helpers.py:734
 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:721
+#: ../src/gtkgui_helpers.py:735
 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:818
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:805
 #, 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:828
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "Salvar Imagem como..."
 
-#: ../src/history_manager.py:73
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
 #. holds jid
-#: ../src/history_manager.py:113
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Contatos"
 
 #. holds time
-#: ../src/history_manager.py:126 ../src/history_manager.py:166
-#: ../src/history_window.py:121
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:132 ../src/history_manager.py:184
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Apelido"
 
 #. holds message
-#: ../src/history_manager.py:140 ../src/history_manager.py:172
-#: ../src/history_window.py:129
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/history_manager.py:192
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -5595,7 +8802,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../src/history_manager.py:194
+#: ../src/history_manager.py:226
 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 "
@@ -5609,293 +8816,262 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:406
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Exportando Histórico de Logs..."
 
-#: ../src/history_manager.py:481
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: ../src/history_manager.py:518
+#: ../src/history_manager.py:549
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Você realmente quer deletar os logs do contato selecionado?"
 msgstr[1] "Você realmente quer deletar os logs dos contatos selecionados?"
 
-#: ../src/history_manager.py:522 ../src/history_manager.py:557
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Você realmente quer deletar a mensagem selecionada?"
 msgstr[1] "Você realmente quer deletar as mensagens selecionadas?"
 
-#: ../src/history_window.py:209 ../src/history_window.py:211
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversação com %s"
 
-#: ../src/history_window.py:342
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Erro de Escrita em Disco"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:346 ../src/notify.py:219
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s agora está %(status)s"
-
-#: ../src/history_window.py:352
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/htmltextview.py:586 ../src/htmltextview.py:597
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
 msgid "Timeout loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
 
-#: ../src/htmltextview.py:607
+#: ../src/htmltextview.py:612
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: ../src/message_window.py:350
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:352
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:354
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "ConversasPrivada"
 
-#: ../src/message_window.py:356
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../src/message_window.py:357
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
-
-#: ../src/negotiation.py:13
+#: ../src/negotiation.py:34
 msgid "- messages will be logged"
 msgstr "- as mensagens serão gravadas"
 
-#: ../src/negotiation.py:15
+#: ../src/negotiation.py:36
 msgid "- messages will not be logged"
 msgstr "- as mensagens não serão gravadas"
 
-#: ../src/negotiation.py:24
-msgid "OK to continue with negotiation?"
-msgstr "Tudo certo para continuar com a negociação?"
-
-#: ../src/negotiation.py:25
-#, python-format
-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"
-"\n"
-"You should speak with them directly (in person or on the phone) and confirm "
-"that their Short Authentication String is identical to this one: %s\n"
-"\n"
-"Would you like to continue with the encrypted session?"
-msgstr ""
-"Você começou uma sessão criptografada com %s, mas não há garantias de que "
-"você esteja falando diretamente com a pessoa que você imagina.\n"
-"\n"
-"Você deve falar com eles diretamente (pessoalmente ou por telefone) e "
-"confirmar que a String de Autenticação Curta deles é idêntica a esta: %s\n"
-"\n"
-"Você quer continuar com a sessão criptografada?"
-
-#: ../src/negotiation.py:31
-msgid "Yes, I verified the Short Authentication String"
-msgstr "Sim, eu verifiquei a String de Verificação Curta"
-
-#: ../src/notify.py:217
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Alterou seu Status"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Conectou"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Desconectou"
 
-#: ../src/notify.py:247
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Simples de %(nickname)s"
 
-#: ../src/notify.py:255
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada da conferência %s"
 
-#: ../src/notify.py:257
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensagem enviada por %(nickname)s"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem de %(nickname)s"
 
-#: ../src/profile_window.py:54
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Geral"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:107 ../src/roster_window.py:1914
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:1917
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:124 ../src/profile_window.py:140
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1930
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: ../src/profile_window.py:250
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "Informação recebida"
 
-#: ../src/profile_window.py:319
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: ../src/profile_window.py:331
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:346
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informação NÃO publicada"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:194 ../src/roster_window.py:249
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:370 ../src/roster_window.py:635
-#: ../src/roster_window.py:2145 ../src/common/contacts.py:312
-#: ../src/common/helpers.py:53
-msgid "Observers"
-msgstr "Observadores"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Autorização foi enviada"
 
-#. Make special context menu if group is Groupchats
-#: ../src/roster_window.py:454 ../src/roster_window.py:459
-#: ../src/roster_window.py:1967 ../src/roster_window.py:1970
-#: ../src/roster_window.py:2640 ../src/roster_window.py:2643
-#: ../src/roster_window.py:2668 ../src/roster_window.py:4763
-#: ../src/roster_window.py:4765 ../src/common/commands.py:199
-#: ../src/common/contacts.py:102 ../src/common/helpers.py:53
-msgid "Groupchats"
-msgstr "Salas"
+#: ../src/roster_window.py:1861
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:784 ../src/roster_window.py:4012
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Solicitação de inscrição foi enviada"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py:1005 ../src/roster_window.py:1015
-#: ../src/roster_window.py:1024 ../src/systray.py:212 ../src/systray.py:217
-#: ../src/systray.py:223
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using account %s"
-msgstr "usando conta %s"
+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."
 
-#. add
-#: ../src/roster_window.py:1031
-#, python-format
-msgid "to %s account"
-msgstr "para %s conta"
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Autorização foi removida"
 
-#. disco
-#: ../src/roster_window.py:1036
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "using %s account"
-msgstr "usando %s conta"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1117
-msgid "_Manage Bookmarks..."
-msgstr "_Gerenciar Favoritos..."
+#: ../src/roster_window.py:1920
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"O Gnome Keyring está instalado mas não corretamente iniciado (provavelmente "
+"a variável de ambiente não está definida corretamente)"
 
-#. profile, avatar
-#: ../src/roster_window.py:1136
-#, python-format
-msgid "of account %s"
-msgstr "da conta %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:1176
-#, python-format
-msgid "for account %s"
-msgstr "para conta %s"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Você está participando em uma ou mais conferências"
 
-#. History manager
-#: ../src/roster_window.py:1200
-msgid "History Manager"
-msgstr "Gerenciador de Histórico"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:1209
-msgid "_Join New Group Chat"
-msgstr "_Ingressar em uma nova Conferência"
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1576 ../src/roster_window.py:4217
-#: ../src/roster_window.py:4224
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:1577
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Mensagem somente estará disponível para leitura mais tarde se você tiver o "
+"histórico habilitado."
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:1580
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1581
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5903,163 +9079,66 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:1584
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:1589
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Você não poderá enviar e receber mensagens para contatos destes transportes: "
 "%s"
 
 #. it's jid
-#: ../src/roster_window.py:1755
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Renomear Contato"
 
-#: ../src/roster_window.py:1756
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:1763
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Renomear Grupo"
 
-#: ../src/roster_window.py:1764
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:1839
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Remover Grupo"
 
-#: ../src/roster_window.py:1840
+#: ../src/roster_window.py:2734
 #, 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:1841
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Remover também todos os contatos neste grupo da sua lista"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:2191
-msgid "_New Group Chat"
-msgstr "_Nova Conferência"
-
-#: ../src/roster_window.py:2331
-msgid "I would like to add you to my roster"
-msgstr "Eu gostaria de adiciona-lo à  minha lista"
-
-#. Send Group Message
-#: ../src/roster_window.py:2465 ../src/roster_window.py:2677
-msgid "Send Group M_essage"
-msgstr "Enviar M_ensagem de Grupo"
-
-#: ../src/roster_window.py:2484
-msgid "_New group chat"
-msgstr "_Nova conferência"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:2522
-msgid "_Manage Contacts"
-msgstr "_Gerenciar Contatos"
-
-#: ../src/roster_window.py:2583
-msgid "_Maximize"
-msgstr "_Maximizar"
-
-#: ../src/roster_window.py:2590
-msgid "_Disconnect"
-msgstr "_Desconectar"
-
-#: ../src/roster_window.py:2669
-msgid "_Maximize All"
-msgstr "_Maximizar Tudo"
-
-#: ../src/roster_window.py:2685
-msgid "To all users"
-msgstr "Para todos os usuários"
-
-#: ../src/roster_window.py:2688
-msgid "To all online users"
-msgstr "Para todos os usuários conectados"
-
-#. Log Off
-#: ../src/roster_window.py:2805
-msgid "_Log off"
-msgstr "_Efetuar logoff"
-
-#. Log on
-#: ../src/roster_window.py:2811
-msgid "_Log on"
-msgstr "_Conectar"
-
-#. Send single message
-#: ../src/roster_window.py:2823
-msgid "Send Single Message"
-msgstr "Enviar Mensagem Simples"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:2870
-msgid "_Manage Transport"
-msgstr "_Gerenciar Transporte"
-
-#. Modify Transport
-#: ../src/roster_window.py:2878
-msgid "_Modify Transport"
-msgstr "_Modificar Transporte"
-
-#: ../src/roster_window.py:2992 ../src/roster_window.py:3066
-msgid "_Change Status Message"
-msgstr "_Mudar Mensagem de Status"
-
-#: ../src/roster_window.py:3138
-msgid "Authorization has been sent"
-msgstr "Autorização foi enviada"
-
-#: ../src/roster_window.py:3139
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Agora \"%s\" saberá seu status."
-
-#: ../src/roster_window.py:3159
-msgid "Subscription request has been sent"
-msgstr "Solicitação de inscrição foi enviada"
-
-#: ../src/roster_window.py:3160
-#, 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:3172
-msgid "Authorization has been removed"
-msgstr "Autorização foi removida"
-
-#: ../src/roster_window.py:3173
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Agora \"%s\" você sempre o verá como offline."
-
-#: ../src/roster_window.py:3407
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3411
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -6067,7 +9146,13 @@ msgstr ""
 "Removendo este contato, você também removerá a autorização, resultando em "
 "ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:3416
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "O que você quer fazer?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -6075,16 +9160,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:3419
+#: ../src/roster_window.py:3144
 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:3423
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3427
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -6094,64 +9179,20 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3454
-msgid ""
-"Gnome Keyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-msgstr ""
-"O Gnome Keyring está instalado mas não corretamente iniciado (provavelmente "
-"a variável de ambiente não está definida corretamente)"
-
-#: ../src/roster_window.py:3473
-msgid "GPG is not usable"
-msgstr "GPG não é usável"
-
-#. %s is the account name here
-#: ../src/roster_window.py:3474 ../src/common/connection_handlers.py:2153
-#: ../src/common/zeroconf/connection_zeroconf.py:171
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Você será conectado ao %s sem OpenPGP."
-
-#: ../src/roster_window.py:3545 ../src/roster_window.py:3623
-msgid "You are participating in one or more group chats"
-msgstr "Você está participando em uma ou mais conferências"
-
-#: ../src/roster_window.py:3546 ../src/roster_window.py:3624
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:3580
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3581
+#: ../src/roster_window.py:3192
 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:3730
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" by %(artist)s"
-
-#: ../src/roster_window.py:4218 ../src/roster_window.py:4225
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Mensagem somente estará disponível para leitura mais tarde se você tiver o "
-"histórico habilitado."
-
-#: ../src/roster_window.py:4849
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor."
 
-#: ../src/roster_window.py:4851
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -6159,13 +9200,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:4896
+#: ../src/roster_window.py:3784
 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:4898
+#: ../src/roster_window.py:3786
 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 "
@@ -6175,170 +9216,323 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4993
+#: ../src/roster_window.py:3899
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Arquivo inválido"
 
-#: ../src/roster_window.py:5004
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Você quer enviar esse arquivo para %s:"
 msgstr[1] "%s quer te enviar um arquivo:"
 
-#: ../src/roster_window.py:5332
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
+#, python-format
+msgid "using account %s"
+msgstr "usando conta %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "para %s conta"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "usando %s conta"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "_Gerenciar Favoritos..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "da conta %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "para conta %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "_Mudar Mensagem de Status"
+
+#: ../src/roster_window.py:4865
+msgid "Publish Tune"
+msgstr ""
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Ativo"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "Configurar _Sala..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr "_Maximizar Tudo"
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "Enviar M_ensagem de Grupo"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Para todos os usuários"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "Para todos os usuários conectados"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Eu gostaria de adiciona-lo à  minha lista"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+msgid "_Manage Contacts"
+msgstr "_Gerenciar Contatos"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+msgid "Send Single Message"
+msgstr "Enviar Mensagem Simples"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+msgid "_Manage Transport"
+msgstr "_Gerenciar Transporte"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+msgid "_Modify Transport"
+msgstr "_Modificar Transporte"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr "_Maximizar"
+
+#: ../src/roster_window.py:5795
+msgid "_Disconnect"
+msgstr "_Desconectar"
+
+#: ../src/roster_window.py:5875
+msgid "_New Group Chat"
+msgstr "_Nova Conferência"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Gerenciador de Histórico"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "_Ingressar em uma nova Conferência"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
-#: ../src/search_window.py:91
+#: ../src/search_window.py:93
 msgid "Waiting for results"
 msgstr "Esperando resultados"
 
-#: ../src/search_window.py:131 ../src/search_window.py:209
+#: ../src/search_window.py:133 ../src/search_window.py:211
 msgid "Error in received dataform"
 msgstr "Erro no formulário de dados recebido"
 
 #. No result
-#: ../src/search_window.py:165 ../src/search_window.py:201
+#: ../src/search_window.py:167 ../src/search_window.py:203
 msgid "No result"
 msgstr "Sem resultados"
 
-#: ../src/secrets.py:45
-msgid ""
-"To continue, Gajim needs to access your stored secrets. Enter your passphrase"
-msgstr ""
-"Para continuar, o Gajim precisa acessar suas senhas armazenadas. Entre com "
-"sua senha"
-
-#: ../src/secrets.py:89
-msgid "Confirm Passphrase"
-msgstr "Confirmar Frase de Acesso"
+#: ../src/session.py:124
+#, fuzzy
+msgid "Disk WriteError"
+msgstr "Erro de Escrita em Disco"
 
-#: ../src/secrets.py:90
-msgid "Enter your new passphrase again for confirmation"
-msgstr "Digite novamente sua nova frase de acessar para confirmação"
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "Assunto: %s"
 
-#: ../src/secrets.py:95 ../src/secrets.py:107
-msgid "Create Passphrase"
-msgstr "Criar Frase de Acesso"
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr "Confirme essas opções de sessão"
 
-#: ../src/secrets.py:96
-msgid "Passphrases did not match.\n"
-msgstr "Frases de acesso não conferem.\n"
+#: ../src/session.py:400
+#, fuzzy, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+"O cliente remoto quer negociar uma sessão com esses recursos:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tEssas opções são aceitáveis?"
 
-#: ../src/secrets.py:97 ../src/secrets.py:108
-msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
 msgstr ""
-"O Gajim precisa que você crie uma frase de acesso para criptografar as "
-"senhas armazenadas"
+"O cliente remoto selecionou essas opções:\n"
+"\n"
+"%s\n"
+"\n"
+"Continuar com a sessão?"
 
-#: ../src/systray.py:169
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Status..."
 
-#: ../src/systray.py:254
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: ../src/tooltips.py:316 ../src/tooltips.py:509
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:319 ../src/tooltips.py:513
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dessa sala"
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:432
 msgid " [blocked]"
 msgstr "[bloqueado]"
 
-#: ../src/tooltips.py:426
+#: ../src/tooltips.py:436
 msgid " [minimized]"
 msgstr "[minimizado]"
 
-#: ../src/tooltips.py:441 ../src/tooltips.py:629
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:471
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Último status: %s"
 
-#: ../src/tooltips.py:473
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr "desde %s"
 
-#: ../src/tooltips.py:491
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:520
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:530
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Sala:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Ativado"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Tipo:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:591
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:598
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:607 ../src/tooltips.py:628
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:611
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:613 ../src/tooltips.py:616
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?status da transferência: Parado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:624
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:626
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:660
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -6354,14 +9548,15 @@ msgstr "?Cliente:Desconhecido"
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:472
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
 #: ../src/vcard.py:311
-msgid "Affiliation:"
-msgstr "Filiação:"
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Aplicações</b>"
 
 #: ../src/vcard.py:319
 msgid ""
@@ -6393,1516 +9588,324 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido da subscrição"
 
-#: ../src/vcard.py:337 ../src/vcard.py:374 ../src/vcard.py:497
-msgid " resource with priority "
-msgstr " recurso com prioridade "
-
-#: ../src/common/check_paths.py:38
-msgid "creating logs database"
-msgstr "criando banco de dados de logs"
-
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:112
-#: ../src/common/check_paths.py:119
-#, 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:102 ../src/common/check_paths.py:113
-#: ../src/common/check_paths.py:120 ../src/common/check_paths.py:128
-msgid "Gajim will now exit"
-msgstr "Gajim sairá agora"
-
-#: ../src/common/check_paths.py:127
-#, 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:143
-#, python-format
-msgid "creating %s directory"
-msgstr "criando diretório %s"
-
-#: ../src/common/commands.py:74
-msgid "Change status information"
-msgstr "Alterar informação de status"
-
-#: ../src/common/commands.py:87
-msgid "Change status"
-msgstr "Alterar status"
-
-#: ../src/common/commands.py:88
-msgid "Set the presence type and description"
-msgstr "Definir o tipo e a descrição da presença"
-
-#: ../src/common/commands.py:94
-msgid "Free for chat"
-msgstr "Livre para conversa"
-
-#: ../src/common/commands.py:95
-msgid "Online"
-msgstr "Conectado"
-
-#: ../src/common/commands.py:97
-msgid "Extended away"
-msgstr "Muito afastado"
-
-#: ../src/common/commands.py:98
-msgid "Do not disturb"
-msgstr "Não perturbe"
-
-#: ../src/common/commands.py:99
-msgid "Offline - disconnect"
-msgstr "Desconectado"
-
-#: ../src/common/commands.py:104
-msgid "Presence description:"
-msgstr "Descrição da presença:"
-
-#: ../src/common/commands.py:139
-msgid "The status has been changed."
-msgstr "O status foi alterado."
-
-#: ../src/common/commands.py:184
-#, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s da sala %(room_jid)s"
-
-#: ../src/common/commands.py:188
-msgid "You have not joined a groupchat."
-msgstr "Você não entrou em uma sala."
-
-#: ../src/common/commands.py:194
-msgid "Leave Groupchats"
-msgstr "Sair das salas"
-
-#: ../src/common/commands.py:195
-msgid "Choose the groupchats you want to leave"
-msgstr "Selecione as salas das quais você quer sair"
-
-#: ../src/common/commands.py:235
-msgid "You left the following groupchats:"
-msgstr "Você saiu das seguintes salas:"
-
-#: ../src/common/commands.py:247
-msgid "Forward unread messages"
-msgstr "Encaminhar mensagens não lidas"
-
-#: ../src/common/commands.py:267
-msgid "All unread messages have been forwarded."
-msgstr "Todas as mensagens não lidas foram encaminhadas."
-
-#: ../src/common/config.py:74
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
-
-#: ../src/common/config.py:79
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Minutos, depois do qual seu status mudam a afastado."
-
-#: ../src/common/config.py:80
-msgid "Away as a result of being idle"
-msgstr "Afastado em conseqüência de estar inativo"
-
-#: ../src/common/config.py:82
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Minutos, depois do qual seu status mudam a nao disponível."
-
-#: ../src/common/config.py:83
-msgid "Not available as a result of being idle"
-msgstr "Não disponível em conseqüência de estar inativo"
-
-#: ../src/common/config.py:101
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-"Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
-
-#: ../src/common/config.py:106
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
-
-#: ../src/common/config.py:109
-msgid "Language used by speller"
-msgstr "Idioma usado pelo corretor ortográfico"
-
-#: ../src/common/config.py:110
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'sempre' - mostrar hora para cada mensagem.\n"
-"'às vezes' - mostrar hora a cada print_ichat_every_foo_minutes minutos.\n"
-"'nunca' - nunca mostrar a hora."
-
-#: ../src/common/config.py:111
-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 ""
-"Mostrar a hora nas conversas usando relógio impreciso. O valor de imprecisão "
-"varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
-"menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
-
-#: ../src/common/config.py:114
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Aproveite os pare * /_ como caracteres de formatação. "
-
-#: ../src/common/config.py:115
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Se verdadeiro, não remova */_. Assim * ABC * seja negrito(realce) mas com * "
-"* não removido."
-
-#: ../src/common/config.py:118
-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 ""
-"Usar marcação de texto ReStructured para HTML, mais formatação ASCII, se "
-"selecionada. Para informações sobre sintaxe, veja http://docutils."
-"sourceforge.net/docs/ref/rst/restructuredtext.html (Se você quiser usar "
-"isso, instale o docutils)"
-
-#: ../src/common/config.py:127
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Caracter a adicionar ao apelido quando se estiver usando o recurso de "
-"completar apelido (tecla Tab) na conferência."
-
-#: ../src/common/config.py:128
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"O caracter a ser proposto para adicionar ao final do apelido desejado quando "
-"ele já estiver sendo usado por outra pessoa na conferência."
-
-#: ../src/common/config.py:151
-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 ""
-"Esta opção lhe permite personalizar o carimbo de tempo que é exibido na "
-"conversação. Por exemplo: \"[%H:%M]\" mostrará \"[hora:minuto]\". Procure "
-"por strftime na documentação do Python: http://docs.python.org/lib/module-"
-"time.html"
-
-#: ../src/common/config.py:152
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
-
-#: ../src/common/config.py:153
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
-
-#: ../src/common/config.py:156
-msgid ""
-"If checked, Gajim can regularly poll a Last.fm account and adjust the status "
-"message to reflect recently played songs. "
-"set_status_msg_from_current_music_track option must be False."
-msgstr ""
-"Se marcado, o Gajim pode pesquisar regularmente em uma conta do Last.fm para "
-"ajustar a mensagem de status de modo a refletir as músicas tocadas "
-"recentemente. A opção set_status_msg_from_current_music_track precisa ser "
-"Falso."
-
-#: ../src/common/config.py:157
-msgid "The username used to identify the Last.fm account."
-msgstr "O nome de usuário usado para identificar a conta Last.fm."
-
-#: ../src/common/config.py:162
-msgid "Add * and [n] in roster title?"
-msgstr "Adicionar * e [n] no título da lista?"
-
-#: ../src/common/config.py:163
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
-"papo for reaberta."
-
-#: ../src/common/config.py:164
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Quantos minutos mostrar ao exibir as últimas linhas da conversação anterior."
-
-#: ../src/common/config.py:165
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter "
-"(comportamento padrão do cliente ICQ da Mirabilis)."
-
-#: ../src/common/config.py:167
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Quantas linhas armazenar com Ctrl+Acima."
-
-#: ../src/common/config.py:170
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou ' em "
-"WIKTIONARY ' que significam o uso wiktionary."
 
-#: ../src/common/config.py:173
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr ""
-"Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
-
-#: ../src/common/config.py:174
-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 ""
-"Se Verdadeiro, ouve aos sinais do D-Bus do NetworkManager e altera os status "
-"das contas (fornecido se eles não tiverem a opção listen_to_network_manager "
-"configurado para Falso e se estiverem sincronizadas com o status global) "
-"baseado no status da conexão de rede."
-
-#: ../src/common/config.py:175
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-"Notificações de estado de conversa enviados. Pode ser one of all, "
-"composing_only, disabled."
-
-#: ../src/common/config.py:176
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"Notificações de estado de conversa exibidos nas janelas de conversa. Pode "
-"ser one of all, composing_only, disabled."
-
-#: ../src/common/config.py:178
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-"Quando não estiver exibindo a hora para cada mensagem (print_time == "
-"simetimes), exibi-lo a cada x minutos."
-
-#: ../src/common/config.py:179
-msgid "Ask before closing a group chat tab/window."
-msgstr "Perguntar antes de fechar um aba ou janela de conferência."
-
-#: ../src/common/config.py:180
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
-"espaço de JID's de conferências."
-
-#: ../src/common/config.py:181
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
-"separada por espaço de salas separadas por jids."
-
-#: ../src/common/config.py:184
-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 ""
-"Lista separada por vírgula dos servidores que nós enviaremos, em adição às "
-"interfaces locais, para Transferência de Arquivo no caso de tradução de "
-"endereço/encaminhamento de porta."
-
-#: ../src/common/config.py:186
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
-
-#: ../src/common/config.py:188
-msgid "Notify of events in the system trayicon."
-msgstr "Notificar os eventos no ícone da bandeja do sistema."
-
-#: ../src/common/config.py:194
-msgid "Show tab when only one conversation?"
-msgstr "Mostrar aba quando tiver apenas uma bate papo?"
-
-#: ../src/common/config.py:195
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Mostrar borda de caderno tabulada nas janelas de conversa?"
-
-#: ../src/common/config.py:196
-msgid "Show close button in tab?"
-msgstr "Mostrar botão de fechar na aba?"
-
-#: ../src/common/config.py:197
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
-"suas mensagens sejam gravadas?"
-
-#: ../src/common/config.py:198
-msgid ""
-"When negotiating an encrypted session, should Gajim prefer to use public "
-"keys for identification?"
-msgstr ""
-"Ao negociar uma sessão criptografada o Gajim deve preferir usar chaves "
-"públicas para identificação?"
-
-#: ../src/common/config.py:207
-msgid "Preview new messages in notification popup?"
-msgstr "Pré-visualizar novas mensagens em uma janela popup?"
-
-#: ../src/common/config.py:212
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr ""
-"Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
-"conferências."
-
-#: ../src/common/config.py:213
-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 ""
-"Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
-"opção só faz sentido quando a opção trayicon está sendo usada."
-
-#: ../src/common/config.py:214
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"Se Verdadeiro, o Gajim verifica ao iniciar se é o cliente Jabber padrão."
-
-#: ../src/common/config.py:215
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
-"lidas. Dependendo do tema, este ícone pode ser animado."
-
-#: ../src/common/config.py:216
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"Se Verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
-"para cada contato sob o nome do contato na janela da lista."
-
-#: ../src/common/config.py:218
-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 ""
-"Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
-"ou tem um cache que é velho demais."
-
-#: ../src/common/config.py:219
-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 ""
-"Se Falso, você não verá por mais muito tempo a linha de status nas conversas "
-"quando um contato alterar seu status e/ou sua mensagem de status."
-
-#: ../src/common/config.py:220
-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 ""
-"pode ser \"none\" (nenhum), \"all\" (todos) ou \"in_and_out\" (dentro e "
-"fora). Se for \"none\", o Gajim não mostrará mais o status nas conferências "
-"quando um membro alterar seu status e/ou sua mensagem de status. Se for \"all"
-"\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
-"Gajim só mostrará FOO entradas/saídas em conferências."
-
-#: ../src/common/config.py:222
-msgid "Background color of contacts when they just signed in."
-msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
-
-#: ../src/common/config.py:223
-msgid "Background color of contacts when they just signed out."
-msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
-
-#: ../src/common/config.py:225
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-"Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
-
-#: ../src/common/config.py:226
-msgid "Don't show avatar for the transport itself."
-msgstr "Não mostrar o avatar para o próprio transporte."
-
-#: ../src/common/config.py:227
-msgid "Don't show roster in the system taskbar."
-msgstr "Não mostrar a lista na bandeja do sistema."
-
-#: ../src/common/config.py:228
-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 ""
-"Se Verdadeiro e as versões do GTK+ e PyGTK instaladas são menores que 2.8, "
-"faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
-"Janela) quando esperam eventos pendentes."
-
-#: ../src/common/config.py:230
-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 ""
-"O Jabberd1.4 não trata informações sha quando alguém entra numa sala "
-"protegida por senha. Mude esta opção para Falso para parar de emitir as "
-"informações sha na presenças de conferências."
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:233
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Controlar a janela onde novas mensagens são colocadas.\n"
-"'sempre' - Todas as mensagens são enviadas para uma única janela.\n"
-"'nunca' - Todas as mensagens recebem sua própria janela.\n"
-"'por ação' - As mensagens para cada conta são enviadas a uma janela "
-"específica.'por tipo' - Cada tipo de mensagem (ex. bate-papo vs. "
-"conferência) são enviadas para uma janela específica. Nota, esta mudança "
-"requer o reinício do Gajim antes que tenham efeito."
-
-#: ../src/common/config.py:234
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr ""
-"Se Falso, você não verá por muito tempo o avatar na janela do bate-papo."
-
-#: ../src/common/config.py:235
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Se Verdadeiro, pressionando a tecla Esc fecha a aba/janela"
-
-#: ../src/common/config.py:236
-msgid "Hides the buttons in chat windows."
-msgstr "Esconder os botões nas janelas de conversa."
-
-#: ../src/common/config.py:237
-msgid "Hides the banner in a group chat window"
-msgstr "Esconder o banner na janela de conferência"
-
-#: ../src/common/config.py:238
-msgid "Hides the banner in two persons chat window"
-msgstr "Esconder o banner na janela de conversa para duas pessoas "
-
-#: ../src/common/config.py:239
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
-
-#: ../src/common/config.py:240
-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 ""
-"Em uma conferência, mostrar o apelido no começo da linha apenas quando a "
-"mensagem atual não for da mesma pessoa que mandou a última."
-
-#: ../src/common/config.py:241
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Usar identação ao mesclar apelidos consecutivos."
-
-#: ../src/common/config.py:242
-msgid "Smooth scroll message in conversation window"
-msgstr "Suavizar a rolagem de mensagens na janela de conversação"
-
-#: ../src/common/config.py:243
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"A lista de cores que serão usadas para os apelidos nas salas de conferência."
-
-#: ../src/common/config.py:244
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
-"Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
-"aba."
-
-#: ../src/common/config.py:245
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-"Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
-"vazia significa que nós nunca devemos mostrar o diálogo."
-
-#: ../src/common/config.py:246
-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 ""
-"Se Verdadeiro, você poderá especificar uma prioridade negativa para a sua "
-"conta na janela de modificação da conta. CUIDADO, quando você estiver "
-"autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
-"mensagem do seu servidor."
-
-#: ../src/common/config.py:247
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"Se Verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
-"as senhas das contas."
-
-#: ../src/common/config.py:248
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-"Se Verdadeiro, o Gajim mostrará o número de contatos online e do total de "
-"contatos nas linha de conta e grupo."
-
-#: ../src/common/config.py:249
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-msgstr ""
-"Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
-"recebidas como se elas fossem do tipo especificado"
-
-#: ../src/common/config.py:250
-msgid ""
-"If True, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
-msgstr ""
-"Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
-"última mensagem, se a janela de conversa ainda não estiver aberta."
-
-#: ../src/common/config.py:251
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Se definido como Verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
-"imagem usando o dvips antes de inseri-la em uma janela de conversa."
-
-#: ../src/common/config.py:252
-msgid "Time of inactivity needed before the change status window closes down."
-msgstr ""
-"O tempo de inatividade necessário antes de fechar a janela de alteração de "
-"status."
-
-#: ../src/common/config.py:253
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
-msgstr ""
-"Número máximo de linhas que são exibidas em conversações. As linhas mais "
-"antigas são apagadas."
-
-#: ../src/common/config.py:254
-msgid ""
-"If True, notification windows from notification-daemon will be attached to "
-"systray icon."
-msgstr ""
-"Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
-"serão anexadas ao ícone da bandeja do sistema."
-
-#: ../src/common/config.py:265
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
-"A prioridade será alterada automaticamente de acordo com o o seu status. As "
-"prioridades são definidas nas opções autopriority_."
-
-#. yes, no, ask
-#: ../src/common/config.py:293
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 rodando"
-
-#: ../src/common/config.py:297
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-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:356
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "O OpenPGP está ativado para este contato?"
-
-#: ../src/common/config.py:357 ../src/common/config.py:360
-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:366
-msgid "all or space separated status"
-msgstr "todos ou lista de status separados por espaço"
-
-#: ../src/common/config.py:367
-msgid "'yes', 'no', or 'both'"
-msgstr "'sim', 'não' ou 'ambos'"
-
-#: ../src/common/config.py:368 ../src/common/config.py:370
-#: ../src/common/config.py:371 ../src/common/config.py:374
-#: ../src/common/config.py:375
-msgid "'yes', 'no' or ''"
-msgstr "'sim', 'não', ou ''"
-
-#: ../src/common/config.py:381
-msgid "Sleeping"
-msgstr "Dormindo"
-
-#: ../src/common/config.py:382
-msgid "Back soon"
-msgstr "Volto logo"
-
-#: ../src/common/config.py:382
-msgid "Back in some minutes."
-msgstr "Volto em alguns minutos."
-
-#: ../src/common/config.py:383
-msgid "Eating"
-msgstr "Comendo"
-
-#: ../src/common/config.py:383
-msgid "I'm eating, so leave me a message."
-msgstr "Eu estou comendo, então deixe-me uma mensagem."
-
-#: ../src/common/config.py:384
-msgid "Movie"
-msgstr "Filme"
-
-#: ../src/common/config.py:384
-msgid "I'm watching a movie."
-msgstr "Estou assistindo um filme."
-
-#: ../src/common/config.py:385
-msgid "Working"
-msgstr "Trabalhando"
-
-#: ../src/common/config.py:385
-msgid "I'm working."
-msgstr "Estou trabalhando."
-
-#: ../src/common/config.py:386
-msgid "Phone"
-msgstr "Telefone"
-
-#: ../src/common/config.py:386
-msgid "I'm on the phone."
-msgstr "Estou no telefone."
-
-#: ../src/common/config.py:387
-msgid "Out"
-msgstr "Estou fora"
-
-#: ../src/common/config.py:387
-msgid "I'm out enjoying life."
-msgstr "Estou fora curtindo a vida."
-
-#: ../src/common/config.py:391
-msgid "I'm available."
-msgstr "Estou disponível."
-
-#: ../src/common/config.py:392
-msgid "I'm free for chat."
-msgstr "Estou livre para conversar."
-
-#: ../src/common/config.py:394
-msgid "I'm not available."
-msgstr "Não estou disponível."
-
-#: ../src/common/config.py:395
-msgid "Do not disturb."
-msgstr "Não perturbe."
-
-#: ../src/common/config.py:396 ../src/common/config.py:397
-msgid "Bye!"
-msgstr "Tchau!"
-
-#: ../src/common/config.py:406
-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 ""
-"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:407
-msgid "Sound to play when any MUC message arrives."
-msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
-
-#: ../src/common/config.py:416 ../src/common/optparser.py:220
-msgid "green"
-msgstr "verde"
-
-#: ../src/common/config.py:420 ../src/common/optparser.py:206
-msgid "grocery"
-msgstr "mantimento"
-
-#: ../src/common/config.py:424
-msgid "human"
-msgstr "humano"
-
-#: ../src/common/config.py:428
-msgid "marine"
-msgstr "marinho"
-
-#: ../src/common/connection_handlers.py:61
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
-msgid "Unable to load idle module"
-msgstr "Incapaz de carregar o módulo inativo"
-
-#: ../src/common/connection_handlers.py:219
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
-msgid "Wrong host"
-msgstr "Servidor errado"
-
-#: ../src/common/connection_handlers.py:220
-msgid "Invalid local address? :-O"
-msgstr "Endereço local inválido? :-O"
-
-#: ../src/common/connection_handlers.py:618
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "A informação do registo para o transporte %s não chegou a tempo"
-
-#: ../src/common/connection_handlers.py:1802
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Apelido não permitido: %s"
-
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1872
-#: ../src/common/connection_handlers.py:1875
-#: ../src/common/connection_handlers.py:1878
-#: ../src/common/connection_handlers.py:1881
-#: ../src/common/connection_handlers.py:1885
-#: ../src/common/connection_handlers.py:1894
-msgid "Unable to join group chat"
-msgstr "Impossível ingressar na sala"
-
-#: ../src/common/connection_handlers.py:1873
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Você está banido da sala %s."
-
-#: ../src/common/connection_handlers.py:1876
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "A sala %s não existe."
-
-#: ../src/common/connection_handlers.py:1879
-msgid "Group chat creation is restricted."
-msgstr "A criação de sala é restrita."
-
-#: ../src/common/connection_handlers.py:1882
-#, 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:1886
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Você não está na lista de membros da sala %s."
-
-#: ../src/common/connection_handlers.py:1895
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"O apelido que você deseja usar está em uso ou registado por um outro "
-"ocupante.\n"
-"Por favor, especifique um outro apelido abaixo:"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1926
-msgid "Room has been destroyed"
-msgstr "A sala foi excluída"
-
-#: ../src/common/connection_handlers.py:1933
-#, 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:1960
-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:1981
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nós estamos agora inscritos para %s"
-
-#: ../src/common/connection_handlers.py:1983
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Remoção de Inscrição solicitada por %s"
-
-#: ../src/common/connection_handlers.py:1985
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nós estamos agora sem inscrição para %s"
-
-#: ../src/common/connection_handlers.py:2112
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"O JID %s não é uma compilação da RFC. Não se adicionará a sua lista.  Use "
-"ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
-"removê-lo"
-
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2151
-#: ../src/common/zeroconf/connection_zeroconf.py:169
-msgid "OpenPGP passphrase was not given"
-msgstr "Palavra-chave do OpenPGP não foi recebida"
-
-#: ../src/common/connection.py:243
-#: ../src/common/zeroconf/connection_zeroconf.py:209
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Conexão com a conta \"%s\" foi perdida"
-
-#: ../src/common/connection.py:244
-msgid "Reconnect manually."
-msgstr "Reconecte manualmente."
-
-#: ../src/common/connection.py:255
-#, python-format
-msgid "Server %s answered wrongly to register request: %s"
-msgstr "O servidor %s respondeu erroneamente à requisição de registro: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:263
-msgid "Invalid answer"
-msgstr "Resposta inválida"
-
-#: ../src/common/connection.py:264
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transporte %s respondeu errado para registar o pedido: %s"
-
-#: ../src/common/connection.py:410
-msgid "Connection to proxy failed"
-msgstr "Falha na conexão com o proxy"
-
-#: ../src/common/connection.py:464 ../src/common/connection.py:510
-#: ../src/common/connection.py:1081
-#: ../src/common/zeroconf/connection_zeroconf.py:243
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Impossível conectar a \"%s\""
-
-#: ../src/common/connection.py:478
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Conectado ao servidor %s:%s com %s"
-
-#: ../src/common/connection.py:511
-msgid "Check your connection or try again later"
-msgstr "Verifique sua conexão ou tente novamente mais tarde"
-
-#: ../src/common/connection.py:536
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Falha na autenticação com \"%s\""
-
-#: ../src/common/connection.py:538
-msgid "Please check your login and password for correctness."
-msgstr "Por favor, verifique seu login e senha para exatidão."
-
-#: ../src/common/connection.py:581
-msgid "Error while removing privacy list"
-msgstr "Erro ao remover lista de privacidade"
-
-#: ../src/common/connection.py:582
-#, 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 ""
-"A lista de privacidade %s não foi removida. Ela pode estar ativa em um ou "
-"mais recursos conectados. Desative-os e tente novamente."
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:856
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Esta mensagem está *criptografada* (Veja:JEP:'27')]"
-
-#: ../src/common/connection.py:930
-#: ../src/common/zeroconf/connection_zeroconf.py:437
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Assunto: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1113
-msgid "Not fetched because of invisible status"
-msgstr "Não baixado por causa do status invisível"
-
-#: ../src/common/contacts.py:299
-msgid "Not in roster"
-msgstr "Fora da lista"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:41
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "Acesso ao python D-Bus foi perdido neste computador"
-
-#: ../src/common/dbus_support.py:42
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
-
-#: ../src/common/exceptions.py:27
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "O pysqlite2 (ou python-pysqlite2) está faltando. Encerrando..."
-
-#: ../src/common/exceptions.py:44
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr ""
-"Serviço não disponível: o Gajim não está funcionando ou o controle remoto é "
-"falso"
-
-#: ../src/common/exceptions.py:52
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr ""
-"O D-Bus não está presente nesta máquina ou o módulo do Python está faltando"
-
-#: ../src/common/exceptions.py:60
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"O bus de sessão não está disponível.\n"
-"Veja http://trac.gajim.org/wiki/GajimDBus"
-
-#: ../src/common/fuzzyclock.py:47
-msgid "one"
-msgstr "um"
-
-#: ../src/common/fuzzyclock.py:47
-msgid "two"
-msgstr "dois"
-
-#: ../src/common/fuzzyclock.py:47
-msgid "three"
-msgstr "três"
-
-#: ../src/common/fuzzyclock.py:47
-msgid "four"
-msgstr "quatro"
-
-#: ../src/common/fuzzyclock.py:47
-msgid "five"
-msgstr "cinco"
-
-#: ../src/common/fuzzyclock.py:47
-msgid "six"
-msgstr "seis"
-
-#: ../src/common/fuzzyclock.py:48
-msgid "seven"
-msgstr "sete"
-
-#: ../src/common/fuzzyclock.py:48
-msgid "eight"
-msgstr "oito"
-
-#: ../src/common/fuzzyclock.py:48
-msgid "nine"
-msgstr "nove"
-
-#: ../src/common/fuzzyclock.py:48
-msgid "ten"
-msgstr "dez"
-
-#: ../src/common/fuzzyclock.py:48
-msgid "eleven"
-msgstr "onze"
-
-#: ../src/common/fuzzyclock.py:49
-msgid "twelve"
-msgstr "doze"
-
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "$0 o'clock"
-msgstr "$0 horas"
-
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five past $0"
-msgstr "$0 e cinco"
-
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
-msgid "ten past $0"
-msgstr "$0 e dez"
-
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
-msgid "quarter past $0"
-msgstr "$0 e quinze"
-
-#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
-msgid "twenty past $0"
-msgstr "$0 e vinte"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " recurso com prioridade "
 
-#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
-msgid "twenty five past $0"
-msgstr "$0 e vinte e cinco"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Criptografia OpenPGP"
 
-#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
-msgid "half past $0"
-msgstr "$0 e meia"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "%s não tem a transmissão uma chave de OpenPGP, nem uma foi atribuída"
 
-#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
-msgid "twenty five to $1"
-msgstr "vinte e cinco para as $1"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Comando não encontrado: /%s (se você quer enviar isto, use este prefixo /"
+#~ "say)"
 
-#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
-msgid "twenty to $1"
-msgstr "vinte para as $1"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
+#~ "exemplo: /%s explodes.)"
 
-#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
-msgid "quarter to $1"
-msgstr "quinze para as $1"
+#~ msgid "Encryption enabled"
+#~ msgstr "Criptografia habilitada"
 
-#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
-msgid "ten to $1"
-msgstr "dez para as $1"
+#~ msgid "Encryption disabled"
+#~ msgstr "Criptografia desabilitada"
 
-#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
-msgid "five to $1"
-msgstr "cinco para as $1"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Clique para ver o histórico de conversas com este contato"
 
-#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:66
-msgid "$1 o'clock"
-msgstr "$1 horas"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Clique para ver o histórico de conversas nesta sala"
 
-#: ../src/common/fuzzyclock.py:69
-msgid "Night"
-msgstr "Noite"
+#~ msgid "<b>History Viewer</b>"
+#~ msgstr "<b>Visualizador de Histórico</b>"
 
-#: ../src/common/fuzzyclock.py:69
-msgid "Early morning"
-msgstr "Madrugada"
+#~ msgid "<b>JID Selection</b>"
+#~ msgstr "<b>Seleção de JID</b>"
 
-#: ../src/common/fuzzyclock.py:69
-msgid "Morning"
-msgstr "Manhã"
+#~ msgid ""
+#~ "Choose the chatlog you want to view. \n"
+#~ "Enter the jid of a groupchat or a contact here. For online accounts you "
+#~ "can even enter a a contact's nickname."
+#~ msgstr ""
+#~ "Selecione o registro de conversa que você quer ver. \n"
+#~ "Entre com o JID de uma sala ou contato aqui. Para contas online você "
+#~ "sempre entra com o apelido do contato."
 
-#: ../src/common/fuzzyclock.py:69
-msgid "Almost noon"
-msgstr "Quase meio-dia"
+#~ msgid "in"
+#~ msgstr "em"
 
-#: ../src/common/fuzzyclock.py:70
-msgid "Noon"
-msgstr "Meio-dia"
+#~ msgid "Accept"
+#~ msgstr "Aceitar"
 
-#: ../src/common/fuzzyclock.py:70
-msgid "Afternoon"
-msgstr "Tarde"
+#~ msgid "Invitation Received"
+#~ msgstr "Convite Recebido"
 
-#: ../src/common/fuzzyclock.py:70
-msgid "Evening"
-msgstr "Noite"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Formato da linha</b>"
 
-#: ../src/common/fuzzyclock.py:70
-msgid "Late evening"
-msgstr "Tarde da noite"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Um exemplo: se você tiver habilitado a mensagem de status para afastado, "
+#~ "o Gajim não perguntará mais por uma mensagem de status quando você mudá-"
+#~ "lo para afastado, ele usará o padrão definido aqui"
 
-#: ../src/common/fuzzyclock.py:72
-msgid "Start of week"
-msgstr "Começo da semana"
+#~ msgid ""
+#~ "Determined by sender\n"
+#~ "Chat message\n"
+#~ "Single message"
+#~ msgstr ""
+#~ "Determinado pelo remetente\n"
+#~ "Mensagem de chat\n"
+#~ "Mensagem simples"
 
-#: ../src/common/fuzzyclock.py:72
-msgid "Middle of week"
-msgstr "Meio da semana"
+#~ msgid "Events"
+#~ msgstr "Eventos"
 
-#: ../src/common/fuzzyclock.py:72
-msgid "End of week"
-msgstr "Fim da semana"
+#~ msgid "Hides buttons in chatwindows to "
+#~ msgstr "Esconder os botões nas janelas de conversa em"
 
-#: ../src/common/fuzzyclock.py:73
-msgid "Weekend!"
-msgstr "Final de semana!"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Nunca\n"
+#~ "Sempre\n"
+#~ "Por conta\n"
+#~ "Por tipo"
 
-#: ../src/common/helpers.py:124
-msgid "Invalid character in username."
-msgstr "Caracter inválido no nome do usuário"
+#~ msgid "Privacy"
+#~ msgstr "Privacidade"
 
-#: ../src/common/helpers.py:129
-msgid "Server address required."
-msgstr "Endereço do servidor é requerido."
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr ""
+#~ "Definir a mensagem de status de acordo com a música que estiver sendo "
+#~ "tocada."
 
-#: ../src/common/helpers.py:134
-msgid "Invalid character in hostname."
-msgstr "Caracter inválido no nome do host"
+#~ msgid "The auto away status message"
+#~ msgstr "A mensagem de status para o ausente automático"
 
-#: ../src/common/helpers.py:140
-msgid "Invalid character in resource."
-msgstr "Caracter inválido no recurso."
+#~ msgid "The auto not available status message"
+#~ msgstr "A mensagem de status para o afastado automático"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:180
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Tratar todas as mensagens recebidas como:"
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:183
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "Use only one message _window:"
+#~ msgstr "Usar apenas uma _janela de mensagem:"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:187
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Funciona para os reprodutores Rhythmbox e Muine. Para mais reprodutores, "
+#~ "por favor visite a página http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:190
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "Controle _Avançado de Notificações..."
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:194
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ msgid "_Font:"
+#~ msgstr "_Fonte:"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:197
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "_Player:"
+#~ msgstr "_Tocador de som:"
 
-#. B means bytes
-#: ../src/common/helpers.py:200
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/helpers.py:231
-msgid "_Busy"
-msgstr "_Ocupado"
+#~ msgid "Address"
+#~ msgstr "Endereço"
 
-#: ../src/common/helpers.py:233
-msgid "Busy"
-msgstr "Ocupado"
+#~ msgid "City:"
+#~ msgstr "Cidade:"
 
-#: ../src/common/helpers.py:236
-msgid "_Not Available"
-msgstr "_Não Disponível"
+#~ msgid "Company:"
+#~ msgstr "Empresa:"
 
-#: ../src/common/helpers.py:241
-msgid "_Free for Chat"
-msgstr "Livre para _Conversa"
+#~ msgid "Country:"
+#~ msgstr "País:"
 
-#: ../src/common/helpers.py:243
-msgid "Free for Chat"
-msgstr "Livre para Conversa"
+#~ msgid "Given:"
+#~ msgstr "Nome:"
 
-#: ../src/common/helpers.py:246
-msgid "_Available"
-msgstr "Dis_ponível"
+#~ msgid "Middle:"
+#~ msgstr "Nome do meio:"
 
-#: ../src/common/helpers.py:250
-msgid "Connecting"
-msgstr "Conectando"
+#~ msgid "Position:"
+#~ msgstr "Cargo:"
 
-#: ../src/common/helpers.py:253
-msgid "A_way"
-msgstr "_Afastado"
+#~ msgid "Prefix:"
+#~ msgstr "Prefixo:"
 
-#: ../src/common/helpers.py:258
-msgid "_Offline"
-msgstr "_Desconectado"
+#~ msgid "Role:"
+#~ msgstr "Função:"
 
-#: ../src/common/helpers.py:260
-msgid "Offline"
-msgstr "Desconectado"
+#~ msgid "State:"
+#~ msgstr "Estado:"
 
-#: ../src/common/helpers.py:263
-msgid "_Invisible"
-msgstr "_Invisível"
+#~ msgid "Suffix:"
+#~ msgstr "Sobrenome:"
 
-#: ../src/common/helpers.py:269
-msgid "?contact has status:Unknown"
-msgstr "?contato tem status:Desconhecido"
+#~ msgid "A_ccounts"
+#~ msgstr "_Contas"
 
-#: ../src/common/helpers.py:271
-msgid "?contact has status:Has errors"
-msgstr "?contato tem status:Com erros"
+#~ msgid "Ask:"
+#~ msgstr "Perguntar:"
 
-#: ../src/common/helpers.py:276
-msgid "?Subscription we already have:None"
-msgstr "?Inscrição existente:Nenhuma"
+#~ msgid "Client:"
+#~ msgstr "Cliente:"
 
-#: ../src/common/helpers.py:278
-msgid "To"
-msgstr "Para"
+#~ msgid "OS:"
+#~ msgstr "SO:"
 
-#: ../src/common/helpers.py:282
-msgid "Both"
-msgstr "Ambos"
+#~ msgid "Subscription:"
+#~ msgstr "Inscrição:"
 
-#: ../src/common/helpers.py:290
-msgid "?Ask (for Subscription):None"
-msgstr "?Pergunta (para Inscrição):Nenhuma"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Você sempre o verá como offline."
 
-#: ../src/common/helpers.py:292
-msgid "Subscribe"
-msgstr "Inscrever"
-
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Role:None"
-msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
-
-#: ../src/common/helpers.py:304
-msgid "Moderators"
-msgstr "Moderadores"
-
-#: ../src/common/helpers.py:306
-msgid "Moderator"
-msgstr "Moderador"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s agora está %s (%s)"
 
-#: ../src/common/helpers.py:309
-msgid "Participants"
-msgstr "Participantes"
+#~ msgid "%s is now %s"
+#~ msgstr "%s agora está %s"
 
-#: ../src/common/helpers.py:311
-msgid "Participant"
-msgstr "Participante"
-
-#: ../src/common/helpers.py:314
-msgid "Visitors"
-msgstr "Visitantes"
-
-#: ../src/common/helpers.py:316
-msgid "Visitor"
-msgstr "Visitante"
-
-#: ../src/common/helpers.py:322
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Filiação do Contato de Conferência:Nenhuma"
-
-#: ../src/common/helpers.py:324
-msgid "Owner"
-msgstr "Dono"
-
-#: ../src/common/helpers.py:326
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../src/common/helpers.py:328
-msgid "Member"
-msgstr "Membro"
-
-#: ../src/common/helpers.py:367
-msgid "is paying attention to the conversation"
-msgstr "está prestando a atenção na conversa"
-
-#: ../src/common/helpers.py:369
-msgid "is doing something else"
-msgstr "está fazendo outra coisa"
-
-#: ../src/common/helpers.py:371
-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:374
-msgid "paused composing a message"
-msgstr "parou de digitar"
-
-#: ../src/common/helpers.py:376
-msgid "has closed the chat window or tab"
-msgstr "fechou a janela de conversa ou aba"
-
-#: ../src/common/helpers.py:947 ../src/common/helpers.py:954
-#, python-format
-msgid "%d message pending"
-msgid_plural "%d messages pending"
-msgstr[0] "%d mensagem pendente"
-msgstr[1] "%s mensagens pendentes"
-
-#: ../src/common/helpers.py:960
-#, python-format
-msgid " from room %s"
-msgstr " da sala %s"
-
-#: ../src/common/helpers.py:963 ../src/common/helpers.py:982
-#, python-format
-msgid " from user %s"
-msgstr " do usuário %s"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "De: %(from_address)s"
 
-#: ../src/common/helpers.py:965
-#, python-format
-msgid " from %s"
-msgstr " de %s"
+#~ msgid "Network Manager support not available"
+#~ msgstr "Não há suporte disponível para o Network Manager"
 
-#: ../src/common/helpers.py:972 ../src/common/helpers.py:979
-#, python-format
-msgid "%d event pending"
-msgid_plural "%d events pending"
-msgstr[0] "%d evento pendente"
-msgstr[1] "%d eventos pendentes"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Suporte de gerenciamento da sessão não disponível (faltando o módulo "
+#~ "gnome.ui)"
 
-#: ../src/common/helpers.py:1012
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uso: %s %s %s \n"
+#~ "\t %s"
 
-#. we talk about a file
-#: ../src/common/optparser.py:65
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: impossível abrir %s para leitura"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:216
-msgid "cyan"
-msgstr "azul celeste"
+#~ msgid "OK to continue with negotiation?"
+#~ msgstr "Tudo certo para continuar com a negociação?"
 
-#: ../src/common/optparser.py:332
-msgid "migrating logs database to indices"
-msgstr "migrando base de dados de registros para índices"
+#~ 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"
+#~ "\n"
+#~ "You should speak with them directly (in person or on the phone) and "
+#~ "confirm that their Short Authentication String is identical to this one: %"
+#~ "s\n"
+#~ "\n"
+#~ "Would you like to continue with the encrypted session?"
+#~ msgstr ""
+#~ "Você começou uma sessão criptografada com %s, mas não há garantias de que "
+#~ "você esteja falando diretamente com a pessoa que você imagina.\n"
+#~ "\n"
+#~ "Você deve falar com eles diretamente (pessoalmente ou por telefone) e "
+#~ "confirmar que a String de Autenticação Curta deles é idêntica a esta: %s\n"
+#~ "\n"
+#~ "Você quer continuar com a sessão criptografada?"
 
-#: ../src/common/passwords.py:88
-#, python-format
-msgid "Gajim account %s"
-msgstr "Conta %s do Gajim"
+#~ msgid "Yes, I verified the Short Authentication String"
+#~ msgstr "Sim, eu verifiquei a String de Verificação Curta"
 
-#: ../src/common/zeroconf/client_zeroconf.py:149
-#: ../src/common/zeroconf/client_zeroconf.py:232
-msgid "Connection to host could not be established"
-msgstr "A conexão ao computador não pôde ser estabelecida."
+#~ msgid "_New group chat"
+#~ msgstr "_Nova conferência"
 
-#: ../src/common/zeroconf/client_zeroconf.py:206
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"A conexão ao computador não pôde ser estabelecida: resposta incorreta do "
-"servidor."
+#~ msgid "_Log off"
+#~ msgstr "_Efetuar logoff"
 
-#: ../src/common/zeroconf/client_zeroconf.py:366
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"A conexão ao computador não pode ser estabelecida: tempo excedido ao "
-"transmitir os dados."
+#~ msgid "_Log on"
+#~ msgstr "_Conectar"
 
-#: ../src/common/zeroconf/client_zeroconf.py:652
-msgid "Contact is offline. Your message could not be sent."
-msgstr "O contato está offline. Sua mensagem não pode ser enviada."
+#~ msgid ""
+#~ "To continue, Gajim needs to access your stored secrets. Enter your "
+#~ "passphrase"
+#~ msgstr ""
+#~ "Para continuar, o Gajim precisa acessar suas senhas armazenadas. Entre "
+#~ "com sua senha"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"O computador %s que você especificou na configuração avançada "
-"ft_override_host_to_send não é válido e será ignorado."
+#~ msgid "Confirm Passphrase"
+#~ msgstr "Confirmar Frase de Acesso"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:210
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr ""
-"Para continuar enviando e recebendo mensagens, você precisará reconectar."
+#~ msgid "Enter your new passphrase again for confirmation"
+#~ msgstr "Digite novamente sua nova frase de acessar para confirmação"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:233
-msgid "Avahi error"
-msgstr "Erro do Avahi"
+#~ msgid "Create Passphrase"
+#~ msgstr "Criar Frase de Acesso"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:233
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Mensagens link-local podem não funcionar adequadamente."
+#~ msgid "Passphrases did not match.\n"
+#~ msgstr "Frases de acesso não conferem.\n"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:244
-msgid "Please check if Avahi is installed."
-msgstr "Por favor verifique se o Avahi está instalado."
+#~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
+#~ msgstr ""
+#~ "O Gajim precisa que você crie uma frase de acesso para criptografar as "
+#~ "senhas armazenadas"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:253
-#: ../src/common/zeroconf/connection_zeroconf.py:257
-msgid "Could not start local service"
-msgstr "Impossível iniciar o serviço local"
+#~ msgid "Affiliation:"
+#~ msgstr "Filiação:"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:254
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "Impossível conectar-se à porta %d."
+#~ msgid ""
+#~ "If checked, Gajim can regularly poll a Last.fm account and adjust the "
+#~ "status message to reflect recently played songs. "
+#~ "set_status_msg_from_current_music_track option must be False."
+#~ msgstr ""
+#~ "Se marcado, o Gajim pode pesquisar regularmente em uma conta do Last.fm "
+#~ "para ajustar a mensagem de status de modo a refletir as músicas tocadas "
+#~ "recentemente. A opção set_status_msg_from_current_music_track precisa ser "
+#~ "Falso."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "Please check if avahi-daemon is running."
-msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "O nome de usuário usado para identificar a conta Last.fm."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:352
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Impossível alterar status da conta \"%s\""
+#~ msgid ""
+#~ "When negotiating an encrypted session, should Gajim prefer to use public "
+#~ "keys for identification?"
+#~ msgstr ""
+#~ "Ao negociar uma sessão criptografada o Gajim deve preferir usar chaves "
+#~ "públicas para identificação?"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:369
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Você não está conectado ou não está visível aos outros. Sua mensagem não "
-"pode ser enviada."
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Conectado ao servidor %s:%s com %s"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid "[This message is encrypted]"
-msgstr "[Esta mensagem está criptografada]"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "A conexão ao computador não pôde ser estabelecida."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Erro ao adicionar serviço. %s"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "A conexão ao computador não pôde ser estabelecida: resposta incorreta do "
+#~ "servidor."
 
 #~ msgid "Save passphrase"
 #~ msgstr "Salvar Frase de acesso"
@@ -7916,9 +9919,6 @@ msgstr "Erro ao adicionar serviço. %s"
 #~ msgid "_Use proxy"
 #~ msgstr "_Usar proxy"
 
-#~ msgid "Accounts"
-#~ msgstr "Contas"
-
 #~ 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 "
@@ -7943,9 +9943,6 @@ msgstr "Erro ao adicionar serviço. %s"
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "_Ativar mensagens \"link-local\""
 
-#~ msgid "_Modify"
-#~ msgstr "_Modificar"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Visão _Compacta    Alt+C"
 
@@ -7999,9 +9996,6 @@ msgstr "Erro ao adicionar serviço. %s"
 #~ "Se marcado, o Gajim lembrará a posição e tamanho da janela principal na "
 #~ "próxima vez que você executa-lo"
 
-#~ msgid "On every _message"
-#~ msgstr "Em todas as _mensagens"
-
 #~ msgid "Outgoing Chat state noti_fications:"
 #~ msgstr "Enviar noti_ficações do status da conversa:"
 
diff --git a/po/ru.po b/po/ru.po
index ef1f1c199..9bf0fdec6 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: 2008-11-07 09:38+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-11-06 19:07+0300\n"
 "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -300,8 +300,8 @@ msgstr "Редактировать личную информацию..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1042
-#: ../src/common/helpers.py:1054 ../src/notify.py:501 ../src/notify.py:532
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
 #: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
@@ -314,8 +314,8 @@ msgstr "Gajim"
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2683
-#: ../src/roster_window.py:5172
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Общие"
 
@@ -380,20 +380,20 @@ msgstr "Информация о вас, сохраненная на сервер
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1558
-#: ../src/config.py:2058
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1148
-#: ../src/config.py:1219 ../src/config.py:1466 ../src/config.py:1471
-#: ../src/config.py:1966 ../src/config.py:2044 ../src/config.py:2057
-#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2752
-#: ../src/roster_window.py:2758 ../src/roster_window.py:2763
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Нет"
 
@@ -573,7 +573,7 @@ msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5123
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "П_ереименовать"
 
@@ -1053,7 +1053,7 @@ msgstr "_Добавить в ростер"
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5819
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_История"
 
@@ -1217,7 +1217,7 @@ msgstr "Настройка тем для Gajim"
 msgid "Gone"
 msgstr "Ушел"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:151
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Неактивен"
 
@@ -1379,7 +1379,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Поиск в базе данных"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "История"
 
@@ -2274,7 +2274,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Обязанности:</b>"
 
@@ -2334,8 +2334,8 @@ msgstr "Удалить учетную запись из Gajim и с _серве�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5160
-#: ../src/roster_window.py:5637 ../src/roster_window.py:5766
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Удалить"
 
@@ -2357,14 +2357,14 @@ msgstr "Редактировать _группы"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5709
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5078 ../src/roster_window.py:5590
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
@@ -2374,7 +2374,7 @@ msgstr "_Удалить"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5088 ../src/roster_window.py:5675
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
 
@@ -2400,8 +2400,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Позволить ему или ей видеть мой статус"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5151 ../src/roster_window.py:5627
-#: ../src/roster_window.py:5756
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Блокировать"
 
@@ -2427,8 +2427,8 @@ msgid "_Subscription"
 msgstr "_Подписка"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5145 ../src/roster_window.py:5621
-#: ../src/roster_window.py:5753
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
@@ -2527,7 +2527,7 @@ msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5778
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "_Информация о контакте"
 
@@ -2748,13 +2748,13 @@ msgstr "Назначить Open_PGP ключ"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5610
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Редактировать _группы"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5736
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "П_ереименовать"
 
@@ -2856,257 +2856,149 @@ msgstr "Скрытый"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Английский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Белорусский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Болгарский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Бретонский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Немецкий"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Британский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Баскский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Французский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Хорватский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Норвежский (букмол)"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Голландский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Польский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Португальский (Бразилия)"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Русский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:68
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Китайский"
 
-#: ../src/chat_control2.py:310 ../src/chat_control.py:332
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control2.py:333 ../src/chat_control2.py:549
-#: ../src/chat_control.py:355 ../src/chat_control.py:548
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control2.py:334 ../src/chat_control2.py:550
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control2.py:1176 ../src/chat_control.py:1437
-#, python-format
-msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s из комнаты %(room_name)s"
-
-#: ../src/chat_control2.py:1257
-#, fuzzy
-msgid "OpenPGP Encryption"
-msgstr "Включить Open_PGP шифрование"
-
-#. we talk about a contact here
-#: ../src/chat_control2.py:1271
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr ""
-
-#: ../src/chat_control2.py:1314
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней "
-"префикс /say)"
-
-#: ../src/chat_control2.py:1321 ../src/chat_control.py:1648
-#: ../src/groupchat_control.py:1652
-#, python-format
-msgid "Commands: %s"
-msgstr "Команды: %s"
-
-#: ../src/chat_control2.py:1324 ../src/chat_control.py:1651
-#: ../src/groupchat_control.py:1666
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Использование: /%s, очищает текстовое окно."
-
-#: ../src/chat_control2.py:1327 ../src/chat_control.py:1654
-#: ../src/groupchat_control.py:1671
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Использование: /%s, скрывает кнопки беседы."
-
-#: ../src/chat_control2.py:1330
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Использование: /% <действие>, совершает действие в текущей комнате. "
-"Используйте третье лицо (например, «/%s взрывается».)"
-
-#: ../src/chat_control2.py:1334 ../src/chat_control.py:1662
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Использование: /%s, посылает пинг контакту"
-
-#: ../src/chat_control2.py:1337 ../src/chat_control.py:1665
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Использование: /%s, посылает сообщение контакту"
-
-#: ../src/chat_control2.py:1340 ../src/chat_control.py:1668
-#: ../src/groupchat_control.py:1710
-#, python-format
-msgid "No help info for /%s"
-msgstr "Нет подсказки для /%s"
-
-#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504
-#, fuzzy
-msgid "Encryption enabled"
-msgstr "E2E шифрование включено"
-
-#: ../src/chat_control2.py:1483 ../src/chat_control.py:1557
-msgid "Session WILL be logged"
-msgstr "Для сеанса БУДЕТ сохранена история сообщений"
-
-#: ../src/chat_control2.py:1485 ../src/chat_control.py:1559
-msgid "Session WILL NOT be logged"
-msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
-
-#: ../src/chat_control2.py:1492 ../src/chat_control.py:1847
-#: ../src/chat_control.py:1860
-msgid "The following message was NOT encrypted"
-msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
-
-#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509
-#: ../src/chat_control2.py:2155
-#, fuzzy
-msgid "Encryption disabled"
-msgstr "E2E шифрование выключено"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+msgid "GPG encryption enabled"
+msgstr "GPG шифрование включено"
 
-#. add_to_roster_menuitem
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control2.py:1672 ../src/chat_control.py:1168
-#: ../src/chat_control.py:2036 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:73 ../src/common/helpers.py:303
-#: ../src/conversation_textview.py:845 ../src/dialogs.py:913
-#: ../src/gajim.py:1630 ../src/normal_control.py:483
-#: ../src/roster_window.py:936 ../src/roster_window.py:1552
-#: ../src/roster_window.py:1554 ../src/roster_window.py:1890
-#: ../src/roster_window.py:3121 ../src/roster_window.py:3145
-#: ../src/roster_window.py:5272 ../src/roster_window.py:5456
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
-#. %s is being replaced in the code with JID
-#: ../src/chat_control2.py:1825 ../src/chat_control.py:2224
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Вы получили новое сообщение от \"%s\""
-
-#: ../src/chat_control2.py:1826 ../src/chat_control.py:2225
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
-"сообщений, то это сообщение будет утеряно."
-
-#: ../src/chat_control.py:1146 ../src/chat_control.py:1542
-msgid "GPG encryption enabled"
-msgstr "GPG шифрование включено"
-
-#: ../src/chat_control.py:1300 ../src/tooltips.py:627
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Неизвестный исполнитель"
 
-#: ../src/chat_control.py:1302 ../src/tooltips.py:632
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Неизвестная песня"
 
-#: ../src/chat_control.py:1304 ../src/tooltips.py:637
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Неизвестный альбом"
 
-#: ../src/chat_control.py:1308 ../src/tooltips.py:639
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3115,7 +3007,7 @@ msgstr ""
 "<b>«%(title)s»</b> <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1314
 #, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -3124,12 +3016,17 @@ msgstr ""
 "%(title)s by %(artist)s\n"
 "из %(source)s"
 
+#: ../src/chat_control.py:1438
+#, 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:1522 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
 msgid "No GPG key assigned"
 msgstr "Ключ GPG не присвоен"
 
-#: ../src/chat_control.py:1523
+#: ../src/chat_control.py:1524
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3137,42 +3034,50 @@ msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения с помощью GPG."
 
-#: ../src/chat_control.py:1532
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "GPG шифрование выключено"
 
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr "Для сеанса БУДЕТ сохранена история сообщений"
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
+
 #. encryption %s active
-#: ../src/chat_control.py:1573
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr "было"
 
-#: ../src/chat_control.py:1573
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr "НЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr "будет"
 
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr "НЕ будет"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1579
+#: ../src/chat_control.py:1580
 msgid "and authenticated"
 msgstr "и заверено"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1583
+#: ../src/chat_control.py:1584
 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:1589
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3181,11 +3086,26 @@ msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Команда не поддерживается учетной записью zeroconf."
 
-#: ../src/chat_control.py:1657 ../src/groupchat_control.py:1687
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Команды: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Использование: /%s, очищает текстовое окно."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Использование: /%s, скрывает кнопки беседы."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3194,23 +3114,38 @@ msgstr ""
 "Использование: /%(command)s <действие>, совершает действие в текущей "
 "комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
 
-#: ../src/chat_control.py:1799
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Использование: /%s, посылает пинг контакту"
+
+#: ../src/chat_control.py:1666
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Использование: /%s, посылает сообщение контакту"
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Нет подсказки для /%s"
+
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: ../src/chat_control.py:1806
+#: ../src/chat_control.py:1807
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: ../src/chat_control.py:1809
+#: ../src/chat_control.py:1810
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1811
+#: ../src/chat_control.py:1812
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1816
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3218,15 +3153,33 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
 "подробностей."
 
-#: ../src/chat_control.py:1818
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:1853
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+msgid "The following message was NOT encrypted"
+msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
+
+#: ../src/chat_control.py:1854
 msgid "The following message was encrypted"
 msgstr "Последнее сообщение зашифровано"
 
-#: ../src/chat_control.py:2375 ../src/common/connection_handlers.py:1859
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:2225
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Вы получили новое сообщение от \"%s\""
+
+#: ../src/chat_control.py:2226
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+"сообщений, то это сообщение будет утеряно."
+
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
 #: ../src/common/connection_handlers.py:1905
 #: ../src/common/connection_handlers.py:2093
 #: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
@@ -3234,7 +3187,7 @@ msgstr "Последнее сообщение зашифровано"
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: ../src/chat_control.py:2376
+#: ../src/chat_control.py:2377
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3243,7 +3196,7 @@ msgstr ""
 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
 "или удалить (вся история будет утеряна)."
 
-#: ../src/chat_control.py:2607
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
@@ -3332,9 +3285,9 @@ msgstr "Выберите конференции, которые вы хотит�
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:73
-#: ../src/roster_window.py:808 ../src/roster_window.py:1556
-#: ../src/roster_window.py:1558 ../src/roster_window.py:5048
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Комнаты"
 
@@ -3807,7 +3760,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прокручивать сообщения в окне чата"
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Список цветов, которые будут использоваться для раскраски ников в комнатах."
 
@@ -4030,7 +3986,7 @@ msgstr "\"yes\" (да), \"no\" (нет) или \"both\" (оба)"
 msgid "'yes', 'no' or ''"
 msgstr "\"yes\" (да), \"no\" (нет) или \"\""
 
-#: ../src/common/config.py:415 ../src/common/pep.py:156
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Сплю"
 
@@ -4058,7 +4014,7 @@ msgstr "В кино"
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:419 ../src/common/pep.py:182
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Работаю"
 
@@ -4090,7 +4046,7 @@ msgstr "Я здесь."
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:427 ../src/config.py:1398
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Скоро буду."
 
@@ -4276,7 +4232,7 @@ msgstr "Не задана парольная фраза OpenPGP"
 #. %s is the account name here
 #: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1941 ../src/roster_window.py:1961
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
@@ -4553,15 +4509,15 @@ msgstr "Нельзя получить из-за невидимости"
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:838
-#: ../src/roster_window.py:1481 ../src/roster_window.py:1548
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1687
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Транспорты"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Не в ростере"
 
@@ -4949,7 +4905,7 @@ msgstr "перестал печатать сообщение"
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
-#: ../src/common/helpers.py:991 ../src/common/helpers.py:998
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4957,22 +4913,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: ../src/common/helpers.py:1004
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " в комнате %s"
 
-#: ../src/common/helpers.py:1007 ../src/common/helpers.py:1026
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr " от пользователя %s"
 
-#: ../src/common/helpers.py:1009
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1016 ../src/common/helpers.py:1023
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4980,7 +4936,7 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5416,195 +5372,225 @@ msgstr "Ланч"
 msgid "Exercising"
 msgstr "Занимаюсь спортом"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:174
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "На велосипеде"
 
 #: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Делаю уборку"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "В походе"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Пробежка"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Спортивные игры"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Бегу"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Катаюсь на лыжах"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Плаваю"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Тренировка"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Уход за собой"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "В spa салоне"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Чищу зубы"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Делаю прическу"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Бреюсь"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Принимаю ванну"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Принимаю душ"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Встреча"
 
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Выходной день"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Гуляю"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "В походе"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "На вечеринке"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Запланированный отпуск"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Пью"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Отдыхаю"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "В походе"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Играю"
 
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Вышел"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "На вечеринке"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Читаю"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Репетиция"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Покупки"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Катаюсь на лыжах"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Общаюсь"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Загораю"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Смотрю ТВ"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Смотрю кино"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Разговариваю"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "В реальной жизни"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Говорю по телефону"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "Говорю по видео телефону"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Путешествую"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Еду с работы/на работу"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Вождение"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "В машине"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "В автобусе"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "В самолёте"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "В поезде"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "В поездке"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Прогулка"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Пишу программу"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "На совещании"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Учусь"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Пишу"
 
@@ -5741,12 +5727,12 @@ msgstr "Всегда использовать приложения OS/X по у�
 msgid "Custom"
 msgstr "Другое"
 
-#: ../src/config.py:651 ../src/dialogs.py:1209
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:652
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5755,252 +5741,252 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/config.py:1017
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:1017
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "текст сообщения сервера"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Следующее сообщение получено в окне с фокусом"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Следующее сообщение получено в окне без фокуса"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:1059
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:1060
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:1061
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:1062
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:1063
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
 #. Name column
-#: ../src/config.py:1320 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
 #: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
-#: ../src/history_window.py:86
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1407
+#: ../src/config.py:1406
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1532 ../src/config.py:1631
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1667 ../src/config.py:1710
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1668
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1694
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1695
+#: ../src/config.py:1694
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1711
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1717
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1718
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Выберите другое."
 
-#: ../src/config.py:1722 ../src/config.py:1726
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1723
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1727
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1801
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Переименовать учетную запись"
 
-#: ../src/config.py:1802
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введите новое название для учетной записи %s"
 
-#: ../src/config.py:1820 ../src/config.py:1828 ../src/config.py:1871
-#: ../src/config.py:3090 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1829
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:2020 ../src/config.py:3163
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:2042
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
 
-#: ../src/config.py:2077
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:2078
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:2097 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
 #: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:2098
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
 
-#: ../src/config.py:2102
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2135
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2318
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2320
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the beginning
-#: ../src/config.py:2356
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2359
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Список администраторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2408 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2421
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2425
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2450
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2452
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6008,11 +5994,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2454
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2455
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6020,11 +6006,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2457
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2458
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6032,11 +6018,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2460
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2461
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6044,7 +6030,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2462
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6060,85 +6046,85 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2559
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2581 ../src/gajim.py:1421 ../src/roster_window.py:1953
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1927
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2583 ../src/roster_window.py:1954
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись \"%s\" подключена к серверу"
 
-#: ../src/config.py:2593
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2689
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Все"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2691
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Нет"
 
-#: ../src/config.py:2759
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2793
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите "
 "эту закладку."
 
-#: ../src/config.py:3073
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3075
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3101
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Дублирующийся Jabber ID"
 
-#: ../src/config.py:3102
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Этот контакт уже настроен в Gajim."
 
-#: ../src/config.py:3119
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3120 ../src/config.py:3309
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6148,24 +6134,24 @@ msgstr ""
 "Дополнительно, или сделать это позже посредством пункта Учетные записи меню "
 "Правка в главном окне программы."
 
-#: ../src/config.py:3138
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
-#: ../src/config.py:3139
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
 
-#: ../src/config.py:3190 ../src/gajim.py:1993
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: ../src/config.py:3191 ../src/gajim.py:1994
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: ../src/config.py:3259
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6180,7 +6166,7 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Вы хотите соединиться с этим сервером?"
 
-#: ../src/config.py:3265 ../src/gajim.py:2017
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6191,19 +6177,19 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: ../src/config.py:3288 ../src/config.py:3327
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3308
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3412
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
@@ -6487,18 +6473,18 @@ msgstr "Войти в комнату с учетной записи %s"
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1452
-#: ../src/groupchat_control.py:1733
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
 #: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
 #: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1901
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
@@ -7602,13 +7588,13 @@ msgstr ""
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1163
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
-#: ../src/gajim.py:1242 ../src/groupchat_control.py:1338
-#: ../src/history_window.py:414 ../src/notify.py:232
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
@@ -7620,7 +7606,7 @@ msgstr "%(jid)s установил(а) тему: %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1369 ../src/groupchat_control.py:1123
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
@@ -7832,8 +7818,8 @@ msgstr "Вы хотите отправить пароль через небез�
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1842
-#: ../src/roster_window.py:3804
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
@@ -7874,7 +7860,7 @@ msgstr ""
 "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
 "emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2620 ../src/roster_window.py:3334
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
@@ -7901,28 +7887,28 @@ msgstr "Закладка успешно добавлена"
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
 
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Показывает помощь для конкретной команды"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7930,48 +7916,48 @@ msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "Учетные записи"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "сообщение"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "сообщение сервера"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7980,19 +7966,19 @@ msgstr ""
 "изменить статус всех учетных записей, у которых установлена опция "
 "\"синхронизировать с глобальным статусом\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта, с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -8002,31 +7988,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -8036,205 +8022,205 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакт для данной учетной записи"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Открыть диалог «Начать беседу»"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с этой учетной записи"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "Учётная запись, из которой будет отправлен XML."
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработать ссылку формата «xmpp:/»"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr "URI для обработки"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Учетная запись, в которой вы хотите его использовать"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Присоединиться к MUC комнате"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "комната"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "JID комнаты"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "Ник"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Используемый ник"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "Пароль:"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Пароль для входа в комнату"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент \"JID контакта\""
 
-#: ../src/gajim-remote.py:326
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8243,15 +8229,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:329
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: ../src/gajim-remote.py:381
+#: ../src/gajim-remote.py:380
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8260,16 +8246,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8278,7 +8264,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:494
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8287,7 +8273,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите \"%(basename)s help %(command)s\" для справки"
 
-#: ../src/gajim-remote.py:499
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8296,7 +8282,7 @@ msgstr ""
 "Аргумент \"%(arg)s\" не задан. \n"
 "Наберите \"%(basename)s help %(command)s\" для справки"
 
-#: ../src/gajim-remote.py:518
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Неверный хост"
 
@@ -8335,137 +8321,137 @@ msgstr "Не удалось отправить личное сообщение"
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%(room)s\" или \"%(nick)s\" вышел."
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: ../src/groupchat_control.py:607
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: ../src/groupchat_control.py:609
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
-#: ../src/groupchat_control.py:1026
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Отправить файл?"
 
-#: ../src/groupchat_control.py:1027
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1126
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/groupchat_control.py:1128
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: ../src/groupchat_control.py:1131
+#: ../src/groupchat_control.py:1132
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:1141
+#: ../src/groupchat_control.py:1142
 #, 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:1148
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1161
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:1199 ../src/groupchat_control.py:1203
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "выключение системы"
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1280
 #, 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:1283
+#: ../src/groupchat_control.py:1284
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1299
 #, 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:1302
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: ../src/groupchat_control.py:1331
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:1336
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1451 ../src/groupchat_control.py:1732
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/groupchat_control.py:1475 ../src/groupchat_control.py:1493
-#: ../src/groupchat_control.py:1577 ../src/groupchat_control.py:1594
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:1509
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "У этой комнаты нет темы"
 
-#: ../src/groupchat_control.py:1520
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
 
-#: ../src/groupchat_control.py:1655
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8478,7 +8464,7 @@ msgstr ""
 "данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_control.py:1662
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8486,7 +8472,7 @@ msgid ""
 msgstr ""
 "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8495,7 +8481,7 @@ msgstr ""
 "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
 "причину, если она указана."
 
-#: ../src/groupchat_control.py:1674
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8504,7 +8490,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_control.py:1678
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8513,7 +8499,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_control.py:1682
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8523,7 +8509,7 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_control.py:1691
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8532,23 +8518,23 @@ msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
 "отсылает сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_control.py:1696
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_control.py:1700
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Использование: /%s, показывает список присутствующих в комнате."
 
-#: ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8556,40 +8542,40 @@ msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_control.py:1836
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты \"%s\"?"
 
-#: ../src/groupchat_control.py:1838
+#: ../src/groupchat_control.py:1839
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1875
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: ../src/groupchat_control.py:1880
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
 # смотря где вылазит меседж - нужно присмотреться
 #. Ask for a reason
-#: ../src/groupchat_control.py:1907
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8597,22 +8583,22 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: ../src/groupchat_control.py:1910
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2082
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:2083 ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2386
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -8698,7 +8684,7 @@ msgstr "Контакты"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Дата"
 
@@ -8709,7 +8695,7 @@ msgstr "Ник"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Сообщение"
 
@@ -8761,26 +8747,26 @@ msgstr[0] "Вы точно хотите удалить выделенное со
 msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
 msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: ../src/history_window.py:329
+#: ../src/history_window.py:332
 msgid "Disk Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/history_window.py:410
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:420
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
@@ -8865,18 +8851,18 @@ msgstr "Общие"
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2797
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2800
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2802 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
@@ -8907,38 +8893,38 @@ msgid ""
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:289 ../src/roster_window.py:965
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1892
+#: ../src/roster_window.py:1882
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1904
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1930
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8946,15 +8932,15 @@ msgstr ""
 "Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно "
 "неверно установлена переменная среды)"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1960
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG использовать невозможно"
 
-#: ../src/roster_window.py:2129 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2130 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8962,15 +8948,15 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2156
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2294 ../src/roster_window.py:2531
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2295
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8978,16 +8964,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2532
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2535
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:2536
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8995,11 +8981,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:2539
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:2544
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9009,51 +8995,51 @@ msgstr ""
 "транспорты:%s."
 
 #. it's jid
-#: ../src/roster_window.py:2678
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:2679
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:2687
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:2744
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2735
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:2784
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/roster_window.py:2785
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3138
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9062,11 +9048,11 @@ msgstr ""
 "не сможет видеть ваш статус."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3147
+#: ../src/roster_window.py:3137
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3151
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9074,16 +9060,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:3154
+#: ../src/roster_window.py:3144
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3158
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9093,20 +9079,20 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:3718
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3720
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9114,12 +9100,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
 "следующем подключении."
 
-#: ../src/roster_window.py:3798
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3800
+#: ../src/roster_window.py:3786
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9129,11 +9115,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:3913
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:3924
+#: ../src/roster_window.py:3910
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9146,123 +9132,123 @@ msgstr[2] "Хотите отправить файлы %s:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4601 ../src/roster_window.py:4672
-#: ../src/roster_window.py:4681 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
 #: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:4688
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:4693
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:4730 ../src/systray.py:303
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4750
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4790
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4852 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:4879
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:4887
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Настроение"
 
-#: ../src/roster_window.py:4893
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Занятие"
 
-#: ../src/roster_window.py:4898
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5049
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
 #. Send Group Message
-#: ../src/roster_window.py:5057 ../src/roster_window.py:5582
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5065
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5069
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: ../src/roster_window.py:5479
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5602
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
 #. Send single message
-#: ../src/roster_window.py:5663
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5719
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5727
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
-#: ../src/roster_window.py:5802
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Выйти"
 
-#: ../src/roster_window.py:5889
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "В _новую комнату"
 
 #. History manager
-#: ../src/roster_window.py:6002
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:6011 ../src/systray.py:341
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:6221
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
@@ -9288,11 +9274,11 @@ msgstr "Ошибка записи на диск"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:399 ../src/session.py:434
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Подтвердить данные настройки сеанса"
 
-#: ../src/session.py:401
+#: ../src/session.py:400
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9307,7 +9293,7 @@ msgstr ""
 "\n"
 "\tПриемлемы ли эти настройки?"
 
-#: ../src/session.py:435
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9447,24 +9433,24 @@ msgstr ""
 "Этот сервис не может предоставить подробную информацию о себе. \n"
 "Скорее всего, он устарел или сломан"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:483
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "с %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9472,7 +9458,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9480,29 +9466,54 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Нет ожидающего запроса на подписку."
 
-#: ../src/vcard.py:340 ../src/vcard.py:378 ../src/vcard.py:508
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Включить Open_PGP шифрование"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к "
+#~ "ней префикс /say)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Использование: /% <действие>, совершает действие в текущей комнате. "
+#~ "Используйте третье лицо (например, «/%s взрывается».)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E шифрование включено"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E шифрование выключено"
+
 #~ msgid "The username used to identify the Last.fm account."
 #~ msgstr "Имя пользователя на Last.fm."
 
diff --git a/po/sk.po b/po/sk.po
index f838de363..863fb53a0 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: 2008-08-25 11:26+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-20 12:08+0200\n"
 "Last-Translator: Pavol Klačanský <pavolzetor@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -30,7 +30,7 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
 msgstr "_Pripojiť sa k diskusnej skupine..."
 
@@ -287,9 +287,9 @@ msgstr "Upraviť osobné informácie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1030
-#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -298,11 +298,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2690
-#: ../src/roster_window.py:5170
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Všeobecné"
 
@@ -366,20 +366,20 @@ msgstr "Informácie o vás sú uložené na serveri"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2045
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1953 ../src/config.py:2031 ../src/config.py:2044
-#: ../src/config.py:3147 ../src/config.py:3215 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2758
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2769
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Žiadny"
 
@@ -545,7 +545,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -560,7 +560,7 @@ msgid "Mer_ge accounts"
 msgstr "Z_lúčiť účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5122
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Preme_novať"
 
@@ -773,7 +773,7 @@ msgid "All statuses"
 msgstr "Všetky stavy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:277
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Preč"
 
@@ -790,7 +790,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Neviditeľný"
 
@@ -799,7 +799,7 @@ msgid "Launch a command"
 msgstr "Vykonať príkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Neprítomný"
 
@@ -976,7 +976,7 @@ msgid "Join _Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "_Pridať do zoznamu..."
 
@@ -1028,10 +1028,10 @@ msgstr "_Pridať do zoznamu"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5797
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_História"
 
@@ -1137,7 +1137,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie upozornenie"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -1145,7 +1145,7 @@ msgstr "_Pokračovať"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozorniť ma, keď sa dokončí prenos"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Otvoriť priečinok s obsahom"
 
@@ -1193,7 +1193,7 @@ msgstr "Úprava tém programu Gajim"
 msgid "Gone"
 msgstr "Minulé"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Neaktívny"
 
@@ -1301,7 +1301,7 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoriť novú správu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Od"
 
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Hľadať v databáze"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "História konverzácie"
 
@@ -1379,7 +1379,7 @@ msgstr "Hľadať:"
 msgid "_Log conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1696
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
@@ -1406,8 +1406,8 @@ msgstr "Posledné:"
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182
-#: ../src/disco.py:1603
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -1508,7 +1508,8 @@ msgid "Browse the chat history (Ctrl+H)"
 msgstr "Prehliadať históriu rozhovoru (Ctrl+H)"
 
 #: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Zmeniť predmet miestnosti (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1538,7 +1539,7 @@ msgstr "Zobraziť profil kontaktu (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Poslať"
 
@@ -1704,10 +1705,6 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Emotikony:"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1717,7 +1714,7 @@ msgstr ""
 "inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v diskusnom "
 "okne."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1727,7 +1724,7 @@ msgstr ""
 "vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
 "informácie druhej strane."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1735,11 +1732,11 @@ msgstr ""
 "Gajim vás bude upozorňovať vyskakovacími oknami v pravej spodnej časti "
 "obrazovky na kontakty, ktoré sa práve odpojili"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1747,20 +1744,20 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:52
 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/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:53
 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/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1768,7 +1765,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
 "používaný počítač."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1776,7 +1773,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
 "oknách s diskusnými skupinami."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1784,28 +1781,28 @@ 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/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
 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/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:58
 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/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:59
 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/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:60
 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 "
@@ -1816,7 +1813,7 @@ msgstr ""
 "pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
 "alebo diskusnú skupinu."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1826,14 +1823,14 @@ msgstr ""
 "neautorizovaných kontaktov. Použite opatrne, pretože to blokuje všetky "
 "správy od akýchkoľvek kontaktov, ktoré nie sú v zozname"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:62
 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:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1841,15 +1838,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zobrazí upozornenie, keď bude prijatý nový e-mail "
 "cez GMail"
 
-#: ../data/glade/preferences_window.glade.h:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"Ak je zaškrtnuté, Gajim bude usporiadavať kontakty v okne so zoznamom a "
-"diskusnými skupinami podľa ich stavu a nie podľa zobrazovaného názvu"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1859,7 +1848,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1867,7 +1856,7 @@ msgstr ""
 "Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
 "použitá predvolená špecifikovaná správa."
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1875,47 +1864,43 @@ msgstr ""
 "Ak nie je zakázané, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorovať rozšírený obsah prichádzajúcich správ"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "Zmeniť okno správ na _kompaktné"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "_Spravovať..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Upozornenia"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Upozorniť keď príde na _Gmail e-mail"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Osobné udalosti"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1925,19 +1910,19 @@ msgstr ""
 "Upozorniť ma o tom\n"
 "Zobraziť len v zozname"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Predvoľby"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Prihlás_il sa"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "_Odhlásil sa"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1945,23 +1930,28 @@ 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/glade/preferences_window.glade.h:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Zotriediť kontakty podľa stavu"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "Zostava stavových _ikôn:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Štýl"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -1969,7 +1959,7 @@ msgstr ""
 "Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
 "stavovú správu o stave"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -1977,42 +1967,52 @@ msgstr ""
 "Automatická správa pre stav neprítomný. Ak je prázdna, Gajim nebude meniť "
 "súčasnú správu o stave"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Použiť ikony _transportov"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Použiť systémové _nastavenia"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Keď nastane nová udalosť:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "_Preč po:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Prehliadač:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "Zo_braziť upozornenia o stave rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emotikony:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Správca súborov:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
 
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorovať rozšírený obsah prichádzajúcich správ"
+
 #: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "_Prichádzajúca správa:"
@@ -2046,22 +2046,28 @@ msgid "_Send chat state notifications:"
 msgstr "Odo_slať upozornenia o stave rozhovoru:"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Zotriediť kontakty podľa stavu"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "_Správa o stave:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "Zvýrazňovanie _URL:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "_Správanie okna:"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "_Pripojiť sa k diskusnej skupine"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Nie je v zozname"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minút"
 
@@ -2109,7 +2115,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poradie:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Súkromný zoznam"
 
@@ -2253,7 +2259,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titul pred:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Úloha:</b>"
 
@@ -2313,10 +2319,8 @@ msgstr "Odstrániť účet z Gajim aj zo _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5158 ../src/roster_window.py:5615
-#: ../src/roster_window.py:5744
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "O_dstrániť"
 
@@ -2338,59 +2342,64 @@ msgstr "Upraviť _skupiny..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5077 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5087 ../src/roster_window.py:5653
+#, fuzzy
+msgid "Remo_ve"
+msgstr "O_dstrániť"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Poslať vlas_tný stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Poslať krátku _správu..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Poslať _súbor..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Nastaviť vlastný _avatar..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Povoliť jemu/jej vidieť môj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5149 ../src/roster_window.py:5605
-#: ../src/roster_window.py:5734
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Blokovať"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
 msgid "_Ignore"
 msgstr "_Ignorovať"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "S_pravovať kontakt"
@@ -2404,8 +2413,8 @@ msgid "_Subscription"
 msgstr "_Požiadavky"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5599
-#: ../src/roster_window.py:5731
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
@@ -2414,45 +2423,46 @@ msgid "_Unignore"
 msgstr "_Neignorovať"
 
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "Úč_ty"
-
-#: ../data/glade/roster_window.glade.h:2
 msgid "Add _Contact..."
 msgstr "Pridať k_ontakt..."
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
 msgstr "Fu_nkcie"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "Prenos _súborov"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené otázky (online)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Pomocník online"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Zobraziť trans_porty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Zobraziť _odhlásené kontakty"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _roster"
 msgstr "Zobraziť _zoznam"
 
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+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:13
 #: ../data/glade/subscription_request_window.glade.h:6
@@ -2463,7 +2473,7 @@ msgstr "_Akcie"
 msgid "_Contents"
 msgstr "Ob_sah"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -2504,11 +2514,11 @@ msgid "_Add contact"
 msgstr "_Pridať kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5756
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "_Informácie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
 msgid "_Search"
 msgstr "_Hľadať"
 
@@ -2726,13 +2736,13 @@ msgstr "Prideliť Open_PGP kľúč"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Upraviť _skupiny"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5714
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Premenovať"
 
@@ -2783,49 +2793,48 @@ msgid "Service returned an error."
 msgstr "Služba vrátila chybu"
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktivovaná"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deaktivovaná"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Logický"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Celočíselný"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Farba"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Názov vlastnosti"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Žiadny)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Skryté"
 
@@ -2834,229 +2843,252 @@ msgstr "Skryté"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Bieloruština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulharčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretónčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Nemčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Gréčtina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Španielčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francúzština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Chorvátčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Taliančina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Nórčina (b)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Nórčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Poľština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugalčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazílska portugalčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Švédčina"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Čínština (Ch)"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1142 ../src/chat_control.py:1534
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1164 ../src/chat_control.py:2014
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843
-#: ../src/dialogs.py:896 ../src/gajim.py:1622 ../src/roster_window.py:926
-#: ../src/roster_window.py:1527 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1869 ../src/roster_window.py:5262
-#: ../src/roster_window.py:5439
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
-#: ../src/chat_control.py:1293 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Neznámy umelec"
 
-#: ../src/chat_control.py:1295 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Neznámy titulok"
 
-#: ../src/chat_control.py:1297 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Neznámy zdroj"
 
-#: ../src/chat_control.py:1301
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
-msgid "<b>\"%(title)s\"</b> by "
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
 msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1308
-#, python-format
-msgid "%(title)s by %(artist)s\n"
-msgstr "%(title)s od %(artist)s\n"
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
 #, 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:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
 #: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:1542 ../src/chat_control.py:1796
-msgid "Session WILL NOT be logged"
-msgstr "Relácia NEBUDE zaznamenaná"
-
-#: ../src/chat_control.py:1544 ../src/chat_control.py:1794
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Relácia NEBUDE zaznamenaná"
+
 #. encryption %s active
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1568
+#: ../src/chat_control.py:1580
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1584
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
-#: ../src/chat_control.py:1575
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1621
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1632 ../src/groupchat_control.py:1524
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
 
-#: ../src/chat_control.py:1635 ../src/groupchat_control.py:1538
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použitie: /%s, vyčistí textové okno."
 
-#: ../src/chat_control.py:1638 ../src/groupchat_control.py:1543
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
 
-#: ../src/chat_control.py:1641 ../src/groupchat_control.py:1559
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3065,71 +3097,90 @@ msgstr ""
 "Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú skupinu. "
 "Použite tretiu osobu. (napr. /%(command)s explodoval.)"
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Použitie: /%s, pošle ping kontaktu"
 
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Použitie: /%s, pošle správu kontaktu"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1582
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žiadne informácie s pomocou pre /%s"
 
-#: ../src/chat_control.py:1783
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1790
-msgid "E2E encryption enabled"
-msgstr "E2E šifrovanie povolené"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Relácia BUDE zaznamenaná"
+
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Relácia NEBUDE zaznamenaná"
+
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1803
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../src/chat_control.py:1832 ../src/chat_control.py:1839
-#: ../src/chat_control.py:1845
-msgid "The following message was "
-msgstr "Nasledujúca správa bola "
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+msgid "The following message was NOT encrypted"
+msgstr "Nasledujúca správa NEbola šifrovaná"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "Nasledujúca správa NEbola šifrovaná"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2193
+#: ../src/chat_control.py:2225
 #, 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:2194
+#: ../src/chat_control.py:2226
 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:2345 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: ../src/chat_control.py:2346 ../src/gajim.py:171
-#, python-format
+#: ../src/chat_control.py:2377
+#, fuzzy, python-format
 msgid ""
-"The database file (%s) cannot be read. Try to repare it or remove it (all "
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste to opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/chat_control.py:2578
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
@@ -3199,40 +3250,40 @@ msgstr ""
 msgid "The status has been changed."
 msgstr "Stav bol zmenený."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Opustiť diskusnú skupinu"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
 #, 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:195
 msgid "You have not joined a groupchat."
 msgstr ""
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
 msgid "Choose the groupchats you want to leave"
 msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:794 ../src/roster_window.py:1531
-#: ../src/roster_window.py:1533 ../src/roster_window.py:5047
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Diskuné skupiny"
 
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "Opustili ste nasledujúce diskusné skupiny:"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr ""
 
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3272,20 +3323,20 @@ msgstr ""
 
 #. sorted alphanum
 #: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3087
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "predvolená"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Povoliť link-local/zeroconf správy"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Jazyk pre kontrolu pravopisu"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3295,25 +3346,25 @@ msgstr ""
 "'sometimes' - zobraziť každých print_ichat_every_foo_minutes minút.\n"
 "'never' - nezobrazovať čas."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3324,7 +3375,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ak to chcete používať, "
 "nainštalujte docutils)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3332,7 +3383,7 @@ msgstr ""
 "Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
 "diskusnej skupine."
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3340,25 +3391,21 @@ msgstr ""
 "Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
 "pripojení znaku."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky zobrazené za prezývkou v konverzáciách"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky zobrazené pred prezývkou v konverzáciách"
 
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "Používateľské meno používané na idintifikovanie Last.fm účtu."
-
 #: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
@@ -3665,7 +3712,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr ""
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Zoznam farieb, ktoré budú použité na zafarbenie prezývok v diskusnej skupine."
 
@@ -3867,7 +3917,7 @@ msgstr "'áno', 'nie', alebo 'oboje'"
 msgid "'yes', 'no' or ''"
 msgstr "'áno', 'nie' alebo ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Spím"
 
@@ -3879,7 +3929,7 @@ msgstr "Hneď som späť"
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Jem"
 
@@ -3895,7 +3945,7 @@ msgstr "Film"
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Pracujem"
 
@@ -3927,7 +3977,7 @@ msgstr "Prítomný."
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: ../src/common/config.py:427 ../src/config.py:1391
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
@@ -3953,11 +4003,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "obchod s potravinami"
 
@@ -3969,7 +4019,7 @@ msgstr "človek"
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:71
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Nie je možné nahrať idle modul"
@@ -3983,109 +4033,114 @@ msgstr "Nesprávny hostiteľ"
 msgid "Invalid local address? :-O"
 msgstr "Neplatná miestna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:635
+#: ../src/common/connection_handlers.py:639
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Redistračné informácie pre službu %s nedorazili včas"
 
-#: ../src/common/connection_handlers.py:918
-#: ../src/common/connection_handlers.py:1813
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2162 ../src/common/connection.py:1203
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:840
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/common/connection_handlers.py:1122 ../src/common/connection.py:841
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: ../src/common/connection_handlers.py:1929
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Súbor databázy (%s) nemôže byť prečítaný. Skúste to opraviť alebo ho "
+"odstrániť (všetko v histórii bude stratené)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Prezývka nie je povolená: %s"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2000
-#: ../src/common/connection_handlers.py:2003
-#: ../src/common/connection_handlers.py:2006
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2013
-#: ../src/common/connection_handlers.py:2022
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: ../src/common/connection_handlers.py:2001
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2004
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2063
 #, 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:2014
+#: ../src/common/connection_handlers.py:2067
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2023
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: ../src/common/connection_handlers.py:2061
+#: ../src/common/connection_handlers.py:2116
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2088
+#: ../src/common/connection_handlers.py:2143
 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:2109
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:2111
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:2113
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection_handlers.py:2275
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4096,205 +4151,215 @@ msgstr ""
 "odstránenie"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2300
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete pripojený k %s bez OpenPGP."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Nepodarilo sa získať certifikát CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodarilo sa dešifrovať CRL podpis"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Podpísanie certifikátu zlyhalo"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL vypršal"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Certifikát nie je dôverný"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Certifikát odmietnutý"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, 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:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, 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:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:703
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1040
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:660
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Nie je možné pripojiť sa k \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Spojenie s účtom \"%s\" bolo stratené"
+
+#: ../src/common/connection.py:666
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:663
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4303,7 +4368,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4312,24 +4377,24 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../src/common/connection.py:704
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
 
-#: ../src/common/connection.py:729
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../src/common/connection.py:793
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4338,12 +4403,12 @@ 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:1084
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1086
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4351,11 +4416,11 @@ msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Ga
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1095
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
 
-#: ../src/common/connection.py:1193
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4365,32 +4430,32 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1365
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117
-#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1523
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1668
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Nie je v zozname"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python väzby chýbajú na tomto počítači"
 
-#: ../src/common/dbus_support.py:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
 
@@ -4570,206 +4635,206 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná."
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:270 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "P_reč"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:323
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:388
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:392
+#: ../src/common/helpers.py:405
 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:395
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
-#: ../src/common/helpers.py:979 ../src/common/helpers.py:986
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4777,22 +4842,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: ../src/common/helpers.py:992
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " z miestnosti %s"
 
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr " od používateľa %s"
 
-#: ../src/common/helpers.py:997
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4800,22 +4865,22 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: ../src/common/helpers.py:1044
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -4828,520 +4893,668 @@ msgstr "Gajim účet %s"
 msgid "Afraid"
 msgstr "Vystrašený"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Prekvapený"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Vyburcovaný"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Nahnevaný"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Vyburcovaný"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Znudený"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Statočný"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Pokojný"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Zvedavý"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Podchladený"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "Ob_sah"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Zmätený"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Spokojný"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Spokojný"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Rozhádzaný"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Rozhádzaný"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deaktivovaná"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Zvedavý"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Odstrániť"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Skľúčený"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Sklamaný"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Znechutený"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Zakázané"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Zmätený"
 
-#: ../src/common/pep.py:38
-msgid "Embarassed"
+#: ../src/common/pep.py:56
+#, fuzzy
+msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Znepokojený"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Koketný"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Frustrovaný"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Šoférujem"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Podráždený"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Previnilý"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Prehriaty"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Ponížený"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Pokorený"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Hladný"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Zranený"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "Rešpektovaný"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Zaľúbený"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Rozhorčený"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Zainteresovaný"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Opitý"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Nepremožiteľný"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Žiarlivý"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Osamelý"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Hostiteľ:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Protivný"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Náladový"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nervózny"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutrálny"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Urazený"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustrovaný"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Hravý"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Hrdý"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Odľahčený"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Odľahčený"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Kajajúci"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Neposedný"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Smutný"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Uštipačný"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Posledná zmena:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Vážny"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Hanblivý"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Chorý"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Ospanlivý"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Vystresovaný"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Prekvapený"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Smädný"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Zamyslený"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Čas"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "deväť"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Ustarostený"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Domáce práce"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Kupujem potraviny"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Čistím"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Varím"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Robím údržbu"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Umývam riad"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Periem"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Záhradničím"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Na obchôdzke"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Pijem pivo"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Pijem kávu"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Pijem čaj"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Desiatujem"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Raňajkujem"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Večeriam"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Obedujem"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Bicyklujem"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Čistím"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Klusám"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Športujem"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Bežím"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Lyžujem"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Plávam"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Posilňujem"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Starám sa o seba"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "V kúpeloch"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "V kaderníctve"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Holím sa"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Kúpem sa"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Sprchujem sa"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Na schôdzke"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Koniec dňa"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Som vonku"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Som na túre"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "Na dovolenke"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Žúrujem"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolenka"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Pijem"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Oddychujem"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Som na túre"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Hrám sa"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Som vonku"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Žúrujem"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Čítam"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Nacvičujem"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "Nakupujem"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Lyžujem"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Mám spoločnosť"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Opalujem sa"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Sledujem TV"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Sledujem film"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Rozprávam"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "Bezprostredne"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Cestujem"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Prichádzam"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Šoférujem"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "V aute"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "V lietadle"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "Vo vlaku"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "Na výlete"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Prechádzam sa"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Kódim"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "Na stretnutí"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Študujem"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Píšem"
 
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Nie je možné použiť port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Možno máte spustenú inú inštanciu programu Gajim. Prenos súboru bude zrušený."
+
 #. we're not english
-#: ../src/common/stanza_session.py:282
+#: ../src/common/stanza_session.py:278
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5433,40 +5646,40 @@ msgstr "Kontakt je odhlásený. Vašu správu nie je možné odoslať."
 msgid "Error while adding service. %s"
 msgstr "Chyba pri pridávaní služby. %s"
 
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: ../src/config.py:319
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:327
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Predvolená správa"
 
-#: ../src/config.py:410
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../src/config.py:452
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Vždy použiť štandartné aplikácie OS/X"
 
-#: ../src/config.py:453
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Vlastný"
 
-#: ../src/config.py:643 ../src/dialogs.py:1198
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pre jazyk %s nie je k dispozícii"
 
-#: ../src/config.py:644
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5476,252 +5689,252 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
 #. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1822 ../src/dialogs.py:1886
-#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793
-#: ../src/history_window.py:86
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1401
+#: ../src/config.py:1406
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: ../src/config.py:1525 ../src/config.py:1624
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1660 ../src/config.py:1701
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1667
 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:1687
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1694
 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:1697
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
-#: ../src/config.py:1698
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1702
+#: ../src/config.py:1710
 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:1708
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už použitý"
 
-#: ../src/config.py:1709
+#: ../src/config.py:1717
 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:1713 ../src/config.py:1717
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1718
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1789
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:1808 ../src/config.py:1816 ../src/config.py:1858
-#: ../src/config.py:3085 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Nesprávné Jabber ID"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2006 ../src/config.py:3157
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:2007 ../src/config.py:3158
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2028
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2029
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
 
-#: ../src/config.py:2064
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2076
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2089
 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:2084 ../src/dialogs.py:1674 ../src/dialogs.py:1810
-#: ../src/dialogs.py:1990 ../src/disco.py:438 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2085
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2089
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2102
 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:2121
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2122
+#: ../src/config.py:2134
 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:2305
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2343
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2345
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2395 ../src/disco.py:762 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2412
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2437
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2439
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5729,11 +5942,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2441
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2442
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5741,11 +5954,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2444
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2445
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5753,17 +5966,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2448
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2449
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5779,85 +5992,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:2552
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2574 ../src/gajim.py:1411 ../src/roster_window.py:1932
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2575 ../src/roster_window.py:1906
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2576 ../src/roster_window.py:1933
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2586
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2682
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:2682
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:2683
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:2684
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2787
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
 "odstráňte túto záložku."
 
-#: ../src/config.py:3068
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3070
+#: ../src/config.py:3074
 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:3096
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Dvojité Jabber ID"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už nastavný v Gajim."
 
-#: ../src/config.py:3114
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3115 ../src/config.py:3302
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5866,24 +6079,24 @@ 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:3133
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3134
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3185 ../src/gajim.py:1983
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../src/config.py:3186 ../src/gajim.py:1984
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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:3254
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -5898,7 +6111,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../src/config.py:3260 ../src/gajim.py:2007
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -5909,30 +6122,30 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3281 ../src/config.py:3320
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3301
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol úspešne vytvorený"
 
-#: ../src/config.py:3404
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3405
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/conversation_textview.py:547
+#: ../src/conversation_textview.py:549
 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:566
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -5940,51 +6153,56 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: ../src/conversation_textview.py:676
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:688
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:712
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:732
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
@@ -6017,156 +6235,144 @@ msgstr "Kontaktné meno: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Meno kontaktu"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG číslo:"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ číslo:"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať do účtu %s"
 
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: ../src/dialogs.py:871 ../src/dialogs.py:877 ../src/dialogs.py:882
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:898
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:934
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "Verzia GTK+:"
 
-#: ../src/dialogs.py:994
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "Verzia PyGTK:"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Súčasní vývojári:"
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1035
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "V neposlednom rade ďakujeme všetkým správcom balíkov."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1031
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Peter Trško (dogmat AT dogmat.us)\n"
 "Pavol Klačanský <pavolzetor@gmail.com>"
 
-#: ../src/dialogs.py:1191
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nie je možné použiť port %s."
-
-#: ../src/dialogs.py:1192
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Možno máte spustenú inú inštanciu programu Gajim. Prenos súboru bude zrušený."
-
-#: ../src/dialogs.py:1199
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6175,88 +6381,88 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1603
+#: ../src/dialogs.py:1614
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1606
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:1667 ../src/gajim.py:2589
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už ste v diskusnej skupine %s"
 
-#: ../src/dialogs.py:1675
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
 
-#: ../src/dialogs.py:1694
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:1765
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/dialogs.py:1766 ../src/groupchat_control.py:1329
-#: ../src/groupchat_control.py:1601
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:1770 ../src/dialogs.py:1776
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1767
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:1783
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie je názov diskusnej skupiny."
 
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1858
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1870
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: ../src/dialogs.py:1883
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: ../src/dialogs.py:1941
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6265,343 +6471,376 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie je možné spracovať \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2025
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2054 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:2056 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
 #. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1576 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1642 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1541 ../src/gajim.py:1609
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1681 ../src/gajim.py:1703
-#: ../src/gajim.py:1720 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1684 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1432 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: ../src/dialogs.py:2070 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Krátka správa"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2388
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Poradie: %(order)s, akcia: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
 
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne upozornenie pre %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Podmienka"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "keď som "
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3836
 #, python-format
 msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
 "\n"
-"This session's Short Authentication String is %(sas)s."
+"This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu overená"
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
 msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+"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:3842
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NEoverená"
 
-#: ../src/dialogs.py:3854
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3869
+#, fuzzy
+msgid "Verify..."
+msgstr "O_veriť"
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:3882
 #, python-format
 msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
 "Authentication String (SAS) as you.\n"
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:3883
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/disco.py:115
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Ostatný"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:119
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:439
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:515
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: ../src/disco.py:655
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -6609,72 +6848,77 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:660 ../src/disco.py:942
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:661
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žiadne položky na prehľadávanie."
 
-#: ../src/disco.py:741
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Neplatný server"
+
+#: ../src/disco.py:754
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
 
-#: ../src/disco.py:781
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Prehliadať"
 
-#: ../src/disco.py:943
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
 
-#: ../src/disco.py:1164
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Vykonať príkaz"
 
-#: ../src/disco.py:1174 ../src/disco.py:1338
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1375
+#: ../src/disco.py:1390
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1557
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1565
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1802
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:1867
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nová správa"
 
-#: ../src/disco.py:1873
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/disco.py:1879
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
@@ -6714,7 +6958,8 @@ msgid "gajim-remote"
 msgstr "gajim-remote"
 
 #: ../src/features_window.py:60
-msgid "A script to controle Gajim via commandline."
+#, fuzzy
+msgid "A script to control Gajim via commandline."
 msgstr "Skript na ovládanie Gajim cez príkazový riadok."
 
 #: ../src/features_window.py:61
@@ -6724,7 +6969,7 @@ msgstr "Vyžaduje python-dbus."
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Funkcia nie je dostupná pod Windows."
 
@@ -6865,8 +7110,18 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Prevádza LaTeX výrazy medzi $$ $$."
 
 #: ../src/features_window.py:101
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
+"pravda v Editor rozšírenej konfigurácie."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
@@ -6930,139 +7185,139 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Stav"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Názov súboru: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Príjemca: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Prenos súboru bol zrušený"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Príjemca: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová správa: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr ""
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie je možné prepísať existujúci súbor \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Do priečinku \"%s\" nie je možné zapisovať"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Uložiť súbor ako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7070,32 +7325,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Súbor:"
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Meno: "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pozastaviť"
 
@@ -7174,69 +7429,77 @@ msgstr ""
 "Pravdepodobne už jeden program Gajim beží\n"
 "Želáte si aj napriek tomu spustiť Gajim?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, 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)."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
-#: ../src/gajim.py:560
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: ../src/gajim.py:562
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/gajim.py:919 ../src/gajim.py:923
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:933 ../src/gajim.py:946
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:978
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: ../src/gajim.py:998
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7244,73 +7507,73 @@ msgstr ""
 "Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
 "Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
 
-#: ../src/gajim.py:1039
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je známy ako %(new_nick)s"
 
-#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216
-#: ../src/history_window.py:408 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: ../src/gajim.py:1296
-#, python-format
-msgid "%s has set the subject to %s"
+#: ../src/gajim.py:1305
+#, fuzzy, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%s má nastavený predmet na %s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1359 ../src/groupchat_control.py:1026
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1364
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1372
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1374
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1412
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
 
-#: ../src/gajim.py:1446
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7318,20 +7581,20 @@ msgstr ""
 "Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
 "GPG agent alebo vrátil nesprávne heslo.\n"
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový e-mail %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1554
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7339,7 +7602,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/gajim.py:1568
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7354,80 +7617,80 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gajim.py:1704
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Úspešne prijatý súbor %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1708
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: ../src/gajim.py:1721
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Nepodarilo sa dešifrovať správu"
 
-#: ../src/gajim.py:1888
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: ../src/gajim.py:1889
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gajim.py:1950
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2004
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7435,15 +7698,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2010
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: ../src/gajim.py:2025
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7454,11 +7717,11 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2048 ../src/gajim.py:2078
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7466,16 +7729,16 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
 "že to chcete urobiť?"
 
-#: ../src/gajim.py:2051 ../src/gajim.py:2081
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: ../src/gajim.py:2052 ../src/gajim.py:2082 ../src/groupchat_control.py:1707
-#: ../src/roster_window.py:3806
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: ../src/gajim.py:2079
+#: ../src/gajim.py:2089
 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?"
@@ -7483,28 +7746,28 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2547 ../src/gajim.py:2568
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/gajim.py:2548
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 "Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
 
-#: ../src/gajim.py:2569
+#: ../src/gajim.py:2594
 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 "
@@ -7514,111 +7777,103 @@ msgstr ""
 "aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
 "trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2595 ../src/roster_window.py:3334
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2876
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: ../src/gajim.py:2973
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/gajim.py:2974
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
 
-#: ../src/gajim.py:2987
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/gajim.py:2988
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
 
-#: ../src/gajim.py:3175
-msgid "Network Manager support not available"
-msgstr "Podpora pre správcu sieťových spojení nie je k dispozícii"
-
-#: ../src/gajim.py:3299
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Zobrazí pomocníka pre daný príkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Zobraziť alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "správa"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7626,19 +7881,19 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7648,30 +7903,30 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp kľúč"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7681,136 +7936,136 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "predmet"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "predmet správy"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Získať podrobné informácie o kontakte"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'kľúč' je názov vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "názov nastavenia, ktoré má byť zmazané"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Pridá kontakt do zoznamu"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Pridá nový kontakt do tohto účtu"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
 "účet)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Vráti počet neprečítaných správ"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvorí dialóg 'Začiatok diskusie'"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Začať rozhovor s použitím účtu %s"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Odoslať vlastné XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML na odoslanie"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -7818,67 +8073,67 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Účet ktorý chcete ovládať"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Pripojiť MUC miestnosť"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "miestnosť"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "JID miestnosti"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "prezývka"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Prezývka na používanie"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Heslo pre vstup do miestnosti"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Kontrolovať, či je Gajim spustený"
 
-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Zobraziť alebo skryť okno ipython"
 
-#: ../src/gajim-remote.py:314
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:333
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7887,15 +8142,15 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote.py:389
+#: ../src/gajim-remote.py:380
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vyzerá že Gajim nebeží. Nemôžete tak použiť gajim-remote."
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7904,16 +8159,16 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7922,7 +8177,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -7931,7 +8186,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:508
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -7940,7 +8195,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie je špecifikovaný. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:527
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Nesprávna uri"
 
@@ -7969,127 +8224,147 @@ msgstr "Nemôžete odstrániť súčastnú tému"
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
 
-#: ../src/groupchat_control.py:145
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:383
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: ../src/groupchat_control.py:535
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: ../src/groupchat_control.py:537
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Zaznamenávanie miestosti je povolené"
 
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1132
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1142
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1051
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1064
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: ../src/groupchat_control.py:1107
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s bol vykopnutý: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:1214
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Diskusná skupina nemá nastavený predmet"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvaný %(contact_jid)s do %(room_jid)s."
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8102,7 +8377,7 @@ msgstr ""
 "práve v diskusnej skupine, on/ona/ono bude vykoponutý. Medzery v prezývkach "
 "nie sú podporované."
 
-#: ../src/groupchat_control.py:1534
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8111,7 +8386,7 @@ msgstr ""
 "Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
 "používateľom."
 
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8120,7 +8395,7 @@ msgstr ""
 "Použitie: /%s [dôvod], zatvorí aktuálnu kartu v okne a zobrazí zdôvodnenie, "
 "pokiaľ je špecifikované."
 
-#: ../src/groupchat_control.py:1546
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8129,7 +8404,7 @@ msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej diskusnej skupiny, "
 "prípadne sa zobrazí aj dôvod."
 
-#: ../src/groupchat_control.py:1550
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8138,7 +8413,7 @@ msgstr ""
 "Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
 "do miestnosť@server pre prezývku, ak je špecifikovaný."
 
-#: ../src/groupchat_control.py:1554
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8149,7 +8424,7 @@ msgstr ""
 "podľa prezývky, prípadne zobrazí dôvod. Medzery v prezývkach nie sú "
 "podporované."
 
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8158,83 +8433,83 @@ msgstr ""
 "Použitie: /%s <prezývka> [správa], otvorí okno sukromného rozhovoru a pošle "
 "správu určenému používateľovi podľa prezývky."
 
-#: ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
 
-#: ../src/groupchat_control.py:1572
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
 
-#: ../src/groupchat_control.py:1576
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Použitie: /%s [téma], zobrazí alebo aktualizuje tému v diskusnej skupine."
 
-#: ../src/groupchat_control.py:1579
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1839
 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:1740
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1773
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %s"
 
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1950
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2247
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
@@ -8318,7 +8593,7 @@ msgstr "Kontakty"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dátum"
 
@@ -8329,7 +8604,7 @@ msgstr "Prezývka"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Správa"
 
@@ -8381,22 +8656,27 @@ msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[1] "Skutočne si želáte zmazať vybranú správu?"
 msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: ../src/history_window.py:404
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Chyba pri zápise na disk"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:414
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:417
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
@@ -8409,19 +8689,19 @@ msgstr "Vypršal čas nahrávania obrázku"
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: ../src/message_window.py:440
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:442
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Diskusné skupiny"
 
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Správy"
 
@@ -8433,42 +8713,42 @@ msgstr "- správy budú zaznamenané"
 msgid "- messages will not be logged"
 msgstr "- správy nebudú zaznamenané"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová správa od %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová súkromná správa od diskusnej skupiny %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Správa od %(nickname)s"
@@ -8481,18 +8761,18 @@ msgstr "Spoločné"
 msgid "Retrieving profile..."
 msgstr "Získava sa profil..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2803
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Súbor je prázdny"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2806
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2808 ../src/roster_window.py:2819
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
@@ -8524,39 +8804,39 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:955
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1882
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
 
-#: ../src/roster_window.py:1883
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8564,15 +8844,15 @@ msgstr ""
 "Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
 "(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
 
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: ../src/roster_window.py:2095 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: ../src/roster_window.py:2096 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8581,15 +8861,15 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2122
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2493
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8597,16 +8877,16 @@ msgstr ""
 "Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
 "kontakt je vo vašom zozname kontaktov."
 
-#: ../src/roster_window.py:2494
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
 
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:2498
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8614,11 +8894,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:2501
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8628,51 +8908,52 @@ msgstr ""
 "transport: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: ../src/roster_window.py:2744
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Odstráni aj všetky kontakty tejto skupiny z vášho zoznamu"
 
-#: ../src/roster_window.py:2790
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3146
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8680,7 +8961,13 @@ msgstr ""
 "Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
-#: ../src/roster_window.py:3151
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Chcete prijať pozvanie?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8688,16 +8975,16 @@ msgstr ""
 "Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
-#: ../src/roster_window.py:3154
+#: ../src/roster_window.py:3144
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3158
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8707,47 +8994,47 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: ../src/roster_window.py:3720
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3800
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:3802
+#: ../src/roster_window.py:3786
 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:3915
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: ../src/roster_window.py:3926
-#, python-format
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Chcete poslať tieto súbory účtu %s:"
 msgstr[1] "Chcete poslať tento súbor účtu %s:"
 msgstr[2] "Chcete poslať tieto súbory účtu %s:"
@@ -8757,123 +9044,123 @@ msgstr[2] "Chcete poslať tieto súbory účtu %s:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4598 ../src/roster_window.py:4669
-#: ../src/roster_window.py:4678 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
 #. add
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:4690
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:4730
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "_Spravovať záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4749
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:4851 ../src/roster_window.py:4960
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:4878
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: ../src/roster_window.py:4885
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Nálada"
 
-#: ../src/roster_window.py:4889
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Aktivita"
 
-#: ../src/roster_window.py:4894
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Nastavovať služby..."
 
-#: ../src/roster_window.py:5048
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
 #. Send Group Message
-#: ../src/roster_window.py:5056 ../src/roster_window.py:5560
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: ../src/roster_window.py:5068
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#: ../src/roster_window.py:5462
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Chcem si vás pridať do svojho zoznamu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5580
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
 #. Send single message
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5697
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
-#: ../src/roster_window.py:5780
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
-#: ../src/roster_window.py:5867
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Nová diskusná skupina"
 
 #. History manager
-#: ../src/roster_window.py:5980
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: ../src/roster_window.py:5989
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: ../src/roster_window.py:6199
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Zmeniť správu o stave..."
 
@@ -8890,30 +9177,30 @@ msgstr ""
 msgid "No result"
 msgstr "Žiadny výsledok"
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Predmet: %s"
 
-#: ../src/session.py:392 ../src/session.py:430
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Potvrdiť tieto voľby relácie"
 
-#: ../src/session.py:393
+#: ../src/session.py:400
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t\t%s\n"
+"\t%s\n"
 "\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:431
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -8928,19 +9215,19 @@ msgstr ""
 "\n"
 "Pokračovať s reláciou?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/systray.py:261
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Zdroj: "
 
@@ -8957,104 +9244,95 @@ msgstr " [blokovaný]"
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Posledný stav: %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Pripojený"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Odpojený"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Zápis: "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Nálada:"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Aktivita:"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Pieseň:"
 
-#: ../src/tooltips.py:641
-#, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-"z <i>%(source)s</i>"
-
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Nahrať"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Dokončený"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?stav prenosu:Pozastavené"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9062,24 +9340,24 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9087,7 +9365,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:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9095,12 +9373,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:324
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9108,18 +9386,66 @@ 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:333
+#: ../src/vcard.py:332
 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:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Zapnúť Open_PGP šifrovanie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú "
+#~ "skupinu. Použite tretiu osobu. (napr. /%(command)s explodoval.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E šifrovanie povolené"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E šifrovanie zakázané"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Ak je zaškrtnuté, Gajim bude usporiadavať kontakty v okne so zoznamom a "
+#~ "diskusnými skupinami podľa ich stavu a nie podľa zobrazovaného názvu"
+
+#~ msgid "A_ccounts"
+#~ msgstr "Úč_ty"
+
+#~ msgid "%(title)s by %(artist)s\n"
+#~ msgstr "%(title)s od %(artist)s\n"
+
+#~ msgid "The following message was "
+#~ msgstr "Nasledujúca správa bola "
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "Používateľské meno používané na idintifikovanie Last.fm účtu."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Zamyslený"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Podpora pre správcu sieťových spojení nie je k dispozícii"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
+
 #~ msgid "Close"
 #~ msgstr "Zavrieť"
 
@@ -9246,6 +9572,3 @@ msgstr " zdroj s prioritou "
 
 #~ msgid "Tune"
 #~ msgstr "Pieseň"
-
-#~ msgid "The following message was NOT encrypted"
-#~ msgstr "Nasledujúca správa NEbola šifrovaná"
diff --git a/po/sr.po b/po/sr.po
index f6f733293..40a013c54 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: 2008-10-19 19:19+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-15 22:36+0200\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -293,9 +293,9 @@ msgstr "Измени личне информације"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1038
-#: ../src/common/helpers.py:1050 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Гајим"
 
@@ -307,8 +307,8 @@ msgstr "Гајим"
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2659
-#: ../src/roster_window.py:5148
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Опште"
 
@@ -373,20 +373,20 @@ msgstr "Информације о Вама, како су ускладиштен
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1558
-#: ../src/config.py:2058
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1148
-#: ../src/config.py:1219 ../src/config.py:1466 ../src/config.py:1471
-#: ../src/config.py:1966 ../src/config.py:2044 ../src/config.py:2057
-#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:514 ../src/roster_window.py:2728
-#: ../src/roster_window.py:2734 ../src/roster_window.py:2739
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ништа"
 
@@ -549,7 +549,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Џабер ИД:"
 
@@ -564,7 +564,7 @@ msgid "Mer_ge accounts"
 msgstr "_Споји налоге"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5099
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Преи_менуј"
 
@@ -783,7 +783,7 @@ msgid "All statuses"
 msgstr "Сви статуси"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:287
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Одсутан"
 
@@ -800,7 +800,7 @@ msgid "Have "
 msgstr "Имам "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Невидљив"
 
@@ -809,7 +809,7 @@ msgid "Launch a command"
 msgstr "Покрените команду"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Недоступан"
 
@@ -1040,7 +1040,7 @@ msgstr "_Додај на листу контаката"
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Историјат"
 
@@ -1149,7 +1149,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:797
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Настави"
 
@@ -1157,7 +1157,7 @@ msgstr "_Настави"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Обавести ме када се заврши пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
@@ -1205,7 +1205,7 @@ msgstr "Персонализација Гајим тема"
 msgid "Gone"
 msgstr "Отишао"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Неактивно"
 
@@ -1313,7 +1313,7 @@ msgstr "_Глас"
 msgid "Create new post"
 msgstr "Направи нову објаву"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:312
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Од"
 
@@ -1367,7 +1367,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Претражи базу података"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Историјат разговора"
 
@@ -1390,7 +1390,7 @@ msgstr "Претрага:"
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1689
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
@@ -1520,7 +1520,8 @@ msgid "Browse the chat history (Ctrl+H)"
 msgstr "Прегледај историјат разговора (Ctrl+H)"
 
 #: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Промени тему собе (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1550,7 +1551,7 @@ msgstr "Прикажи профил контакта (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Пошаљи"
 
@@ -2126,7 +2127,7 @@ msgstr "Џабер ИД"
 msgid "Order:"
 msgstr "Поредак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2556
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Листа приватности"
 
@@ -2270,7 +2271,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Улога:</b>"
 
@@ -2330,8 +2331,8 @@ msgstr "Уклони налог и из Гајима и са сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5136
-#: ../src/roster_window.py:5613 ../src/roster_window.py:5742
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -2353,14 +2354,14 @@ msgstr "Измени _групе..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Изврши наредбу..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5054 ../src/roster_window.py:5566
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
@@ -2371,7 +2372,7 @@ msgstr "_Уклони"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5651
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Пошаљи кориснички дефинисан статус"
 
@@ -2397,8 +2398,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Дозволи му/јој да види мој статус"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5127 ../src/roster_window.py:5603
-#: ../src/roster_window.py:5732
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Блокирај"
 
@@ -2424,8 +2425,8 @@ msgid "_Subscription"
 msgstr "_Претплата"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5121 ../src/roster_window.py:5597
-#: ../src/roster_window.py:5729
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
@@ -2525,7 +2526,7 @@ msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5754
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "Информације"
 
@@ -2747,13 +2748,13 @@ msgstr "Придружи Open_PGP Кључ"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Измени _групе"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5712
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Преименуј"
 
@@ -2804,49 +2805,48 @@ msgid "Service returned an error."
 msgstr "Сервис је вратио грешку."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Активирано"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Деактивирано"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Да/Не"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Цео број"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Боја"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Име поставке"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Вредност"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(ништа)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Скривен"
 
@@ -2855,258 +2855,149 @@ msgstr "Скривен"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Енглески"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Белоруски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Бугарски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Бретански"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Немачки"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Британски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Баскијски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Француски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Хрватски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Норвешки (б)"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Португалски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Бразилски португалски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Руски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Словачки"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../src/chat_control2.py:60 ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
 
-#: ../src/chat_control2.py:310 ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Језик за правопис"
 
 #. we are not connected
-#: ../src/chat_control2.py:333 ../src/chat_control2.py:549
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control2.py:334 ../src/chat_control2.py:550
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control2.py:1176 ../src/chat_control.py:1435
-#, python-format
-msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
-
-#: ../src/chat_control2.py:1257
-#, fuzzy
-msgid "OpenPGP Encryption"
-msgstr "Укључи/искључи Open_PGP енкрипцију"
-
-#. we talk about a contact here
-#: ../src/chat_control2.py:1271
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s није емитовао OpenPGP кључ, нити му је иједан додељен"
-
-#: ../src/chat_control2.py:1314
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Не постоји команда: /%s (ако желите да пошаљете то као поруку, префиксирајте "
-"је са /say)"
-
-#: ../src/chat_control2.py:1321 ../src/chat_control.py:1646
-#: ../src/groupchat_control.py:1635
-#, python-format
-msgid "Commands: %s"
-msgstr "Команда: %s"
-
-#: ../src/chat_control2.py:1324 ../src/chat_control.py:1649
-#: ../src/groupchat_control.py:1649
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Начин коришћења: /%s, празни текстуални прозор"
-
-#: ../src/chat_control2.py:1327 ../src/chat_control.py:1652
-#: ../src/groupchat_control.py:1654
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Начин коришћења: /%s, сакрива дугмад."
-
-#: ../src/chat_control2.py:1330
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
-"разговору. Користититреће лице. (нпр. /%(command)s је експлодирао.)"
-
-#: ../src/chat_control2.py:1334 ../src/chat_control.py:1660
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Начин коришћења: /%s, шаље пинк контакту"
-
-#: ../src/chat_control2.py:1337 ../src/chat_control.py:1663
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Начин коришћења: /%s, шаље поруку контакту"
-
-#: ../src/chat_control2.py:1340 ../src/chat_control.py:1666
-#: ../src/groupchat_control.py:1693
-#, python-format
-msgid "No help info for /%s"
-msgstr "Нема информација ни помоћи за /%s"
-
-#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504
-#, fuzzy
-msgid "Encryption enabled"
-msgstr "E2E енкрипција омогућена"
-
-#: ../src/chat_control2.py:1483 ../src/chat_control.py:1555
-msgid "Session WILL be logged"
-msgstr "Сесија ЋЕ бити памћена"
-
-#: ../src/chat_control2.py:1485 ../src/chat_control.py:1557
-msgid "Session WILL NOT be logged"
-msgstr "Сесија НЕЋЕ бити памћена"
-
-#: ../src/chat_control2.py:1492 ../src/chat_control.py:1845
-#: ../src/chat_control.py:1858
-#, fuzzy
-msgid "The following message was NOT encrypted"
-msgstr "Порука гласи "
-
-#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509
-#: ../src/chat_control2.py:2155
-#, fuzzy
-msgid "Encryption disabled"
-msgstr "E2E енкрипција онемогућена"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+msgid "GPG encryption enabled"
+msgstr "GPG енкрипција омогућена"
 
-#. add_to_roster_menuitem
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control2.py:1672 ../src/chat_control.py:1169
-#: ../src/chat_control.py:2033 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:75 ../src/common/helpers.py:299
-#: ../src/conversation_textview.py:844 ../src/dialogs.py:895
-#: ../src/gajim.py:1628 ../src/normal_control.py:483
-#: ../src/roster_window.py:932 ../src/roster_window.py:1532
-#: ../src/roster_window.py:1534 ../src/roster_window.py:1870
-#: ../src/roster_window.py:3097 ../src/roster_window.py:3121
-#: ../src/roster_window.py:5248 ../src/roster_window.py:5432
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
-#. %s is being replaced in the code with JID
-#: ../src/chat_control2.py:1825 ../src/chat_control.py:2221
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "\"%s\" Вам је управо послао поруку"
-
-#: ../src/chat_control2.py:1826 ../src/chat_control.py:2222
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
-"ће бити изгубљена."
-
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1540
-msgid "GPG encryption enabled"
-msgstr "GPG енкрипција омогућена"
-
-#: ../src/chat_control.py:1298 ../src/tooltips.py:627
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: ../src/chat_control.py:1300 ../src/tooltips.py:632
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: ../src/chat_control.py:1302 ../src/tooltips.py:637
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: ../src/chat_control.py:1306 ../src/tooltips.py:639
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3115,7 +3006,7 @@ msgstr ""
 "<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1311
+#: ../src/chat_control.py:1314
 #, fuzzy, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -3124,47 +3015,60 @@ msgstr ""
 "<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
+#: ../src/chat_control.py:1438
+#, 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:1520 ../src/dialogs.py:3902
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1521
+#: ../src/chat_control.py:1524
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1530
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr "Сесија ЋЕ бити памћена"
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Сесија НЕЋЕ бити памћена"
+
 #. encryption %s active
-#: ../src/chat_control.py:1571
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1571
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1573
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1573
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1577
+#: ../src/chat_control.py:1580
 #, fuzzy
 msgid "and authenticated"
 msgstr "Користи аутентикацију"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1581
+#: ../src/chat_control.py:1584
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Користи аутентикацију"
@@ -3172,18 +3076,33 @@ msgstr "Користи аутентикацију"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1587
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Команда није подржана за zeroconf  налог."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1670
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Команда: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Начин коришћења: /%s, празни текстуални прозор"
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Начин коришћења: /%s, сакрива дугмад."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3192,46 +3111,84 @@ msgstr ""
 "Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
 "разговору. Користититреће лице. (нпр. /%(command)s је експлодирао.)"
 
-#: ../src/chat_control.py:1797
+#: ../src/chat_control.py:1663
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Начин коришћења: /%s, шаље пинк контакту"
+
+#: ../src/chat_control.py:1666
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Начин коришћења: /%s, шаље поруку контакту"
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Нема информација ни помоћи за /%s"
+
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:1804
+#: ../src/chat_control.py:1807
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Ова порука је шифрована]"
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1810
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:1809
+#: ../src/chat_control.py:1812
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:1814
+#: ../src/chat_control.py:1817
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:1816
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:1851
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "Порука гласи "
+
+#: ../src/chat_control.py:1854
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "Порука гласи "
 
-#: ../src/chat_control.py:2372 ../src/gajim.py:170
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:2225
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "\"%s\" Вам је управо послао поруку"
+
+#: ../src/chat_control.py:2226
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
+"ће бити изгубљена."
+
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: ../src/chat_control.py:2373 ../src/gajim.py:171
+#: ../src/chat_control.py:2377
 #, fuzzy, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3240,7 +3197,7 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2604
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
@@ -3329,9 +3286,9 @@ msgstr "Одаберите групне разговоре које желите
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:800 ../src/roster_window.py:1536
-#: ../src/roster_window.py:1538 ../src/roster_window.py:5024
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Групни разговори"
 
@@ -3386,9 +3343,9 @@ msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:449
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3090
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "подразумевано"
 
@@ -3478,15 +3435,11 @@ msgstr "Карактери који ће бити приказани пре на
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Карактери који ће бити приказани после надимка у разговору"
 
-#: ../src/common/config.py:165
-msgid "The username used to identify the Last.fm account."
-msgstr "Корисничко име за Last.fm налог."
-
-#: ../src/common/config.py:169
+#: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Додај * и [n] у наслов листе контаката?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:169
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3494,11 +3447,11 @@ msgstr ""
 "Колико линија претходног разговора памтити када се прозор/језичак  за "
 "разговор поново отвори."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:170
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колико минута да трају линије претходног разговора."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:171
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3506,11 +3459,11 @@ msgstr ""
 "Пошаљи поруку са Ctrl+Enter, а са Enter прави нову линију. (Подразумевано "
 "понашање Миралабисовог ICQ клијента)"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:173
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колико линија сачувати са Ctrl+KeyUP"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:176
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3519,11 +3472,11 @@ msgstr ""
 "Или Ваш специфицирани УРЛ са %s у њему где је %s реч или фраза или 'ВИКИ-"
 "РЕЧНИК' што значи коришћење вики-речника."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:179
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ако је означено, Гајим се може контролисати коришћењем gajim-remote."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:180
 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 "
@@ -3534,14 +3487,14 @@ msgstr ""
 "рачуна (ако немају listen_to_network_manager постављен на неистинито и "
 "синхронизуј са глобалним статусом) у зависности од статуса мрежне конекције."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:181
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:182
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3549,7 +3502,7 @@ msgstr ""
 "Приказана обавештења о стању разговора у прозору за разговор. Може бити "
 "једно од 'сви', 'само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:184
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3557,11 +3510,11 @@ msgstr ""
 "Ако се не исписује време за сваку поруку (print_time==понекад), исписати га "
 "сваких x минута"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:185
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:186
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3569,7 +3522,7 @@ msgstr ""
 "Увек питај пре затварања језичка/прозора када је у питању ова листа одвојена "
 "бланко карактерима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:187
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3577,7 +3530,7 @@ msgstr ""
 "Никад не питај пре затварања језичка/прозора групног разговора када је у "
 "питању ова листаодовојена бланко знацима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:190
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3585,27 +3538,27 @@ msgstr ""
 "Листа хостова одвојена зарезима, коју шаљемо, уз локалне интерефејсе, за "
 "трансфер датотека, у случају прослеђивања порта/НАТовања."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:192
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:194
 msgid "Notify of events in the system trayicon."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:200
 msgid "Show tab when only one conversation?"
 msgstr "Прикажи језичак иако је само један разговор?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:201
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Прикаши границу свеске у прозорима разговора?"
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:202
 msgid "Show close button in tab?"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:203
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -3613,7 +3566,7 @@ msgstr ""
 "Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
 "желите да чувате поруке у дневнику?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:204
 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 "
@@ -3624,18 +3577,18 @@ msgstr ""
 "приоритет, одвојени зарезима. Валидне групе су 1, 2, 5, 14, 15, 16, 17 и 18. "
 "Вишљи бројеви су сугурнији, али тада треба више времена за почетак сесије."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:213
 msgid "Preview new messages in notification popup?"
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:218
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Листа речи одвојена бланко карактерима које ће бити обојене у групним "
 "разговорима"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:219
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3643,14 +3596,14 @@ msgstr ""
 "Ако је истинито, Гајим се завршава када се притисне X дугме. Ово подешавање "
 "се користи само ако је икона системске касете у употреби."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:220
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако је истинито, Гајим проверава да ли је подразумевани џабер клијент на "
 "сваком стартовању."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3658,7 +3611,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати икону на сваком језичку који садржи "
 "непрочитане поруке. У зависности од теме, икона може бити и анимирана."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3666,12 +3619,12 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати статусну поруку (ако није празна) за "
 "сваки контакт у листи контаката"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:227
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Дефинишите позицију аватара у листи контаката. Може бити лево или десно"
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:228
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3679,7 +3632,7 @@ msgstr ""
 "Ако је истинито, Гајим ће послати упит за аватар за сваки контакт који "
 "прошлог пута није  имао аватар или је онај у меморији престар"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:229
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3687,7 +3640,7 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:230
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3701,30 +3654,30 @@ msgstr ""
 "све статусне поруке. Ако је \"in_and_out\". Гајим ће приказивати само поруке "
 "типа тај и тај је ушао/изашао у/из собе."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:232
 msgid "Background color of contacts when they just signed in."
 msgstr "Боја позадине контакта када тек дођу на везу."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed out."
 msgstr "Боја позадине контакта када тек оду са везе."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:235
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако је истинито, враћене поруке из историјата ће бити мањег фонта од "
 "подразумеваног."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:236
 msgid "Don't show avatar for the transport itself."
 msgstr "Не приказуј аватар за сам транспорт."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:237
 msgid "Don't show roster in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:238
 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 "
@@ -3734,7 +3687,7 @@ msgstr ""
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:240
 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 "
@@ -3745,7 +3698,7 @@ msgstr ""
 "у групним разговорима"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3764,31 +3717,31 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:244
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:245
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:246
 msgid "Hides the buttons in chat windows."
 msgstr "Сакрива дугмад у прозорима разговора."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:247
 msgid "Hides the banner in a group chat window"
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:248
 msgid "Hides the banner in two persons chat window"
 msgstr "Сакрива банер у прозору разговора две особе"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:249
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:250
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3796,24 +3749,27 @@ msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Увлачење при коришћењу спајања узастопних надимака."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:252
 msgid "Smooth scroll message in conversation window"
 msgstr "Глатко скроловање у прозору разговора"
 
-#: ../src/common/config.py:254
-msgid "List of colors that will be used to color nicknames in group chats."
+#: ../src/common/config.py:253
+#, 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:254
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab иде на следећи језичак када нема непрочитаних језичака"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:255
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3821,7 +3777,7 @@ msgstr ""
 "Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
 "да никада не приказујемо упит."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:256
 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 "
@@ -3831,7 +3787,7 @@ msgstr ""
 "налог у прозору за измену подешавања налога. БУДИТЕ ОПРЕЗНИ, када сте "
 "повезани са негативним приоритетом НЕЋЕТЕ примати никакве поруке од сервера."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:257
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3839,7 +3795,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:258
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3847,7 +3803,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати укупан број корисника и број коринсика "
 "на вези у групним редовима."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:259
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3855,7 +3811,7 @@ msgstr ""
 "Може бити празно, 'chat' или 'normal'. Ако није празно, третира све долазне "
 "поруке као поруке постављеног типа"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3863,7 +3819,7 @@ msgstr ""
 "Ако је истинито, Гајим ће скроловати и означити контакт који Вам је последњи "
 "послао поруку, ако прозор разговора није отворен."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3871,11 +3827,11 @@ msgstr ""
 "Ако је истинито, Гајим ће конвертовати све карактер између $$ и $$ у слику "
 "користећи dvips у ибацити је у прозор разговора."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:262
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Време неактивности после кога се прозор за измену статуса затвара."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:263
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3883,7 +3839,7 @@ msgstr ""
 "Максимум порука које се приказују у разоговору. Најстарије линије се "
 "склањају."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:264
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3891,18 +3847,18 @@ msgstr ""
 "Ако је истинито, прозор обавештења од сервиса обавештења ће бити закачен за "
 "системску касету."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:265
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Одаберите интервал између две провере да се ништа не дешава на рачунару."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:266
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Промените вредност да промените величину Латекс формула. Више је веће."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:267
 msgid ""
 "Valid uri schemes. Only schemes in this list will be made accepted as \"real"
 "\" uri."
@@ -3910,7 +3866,7 @@ msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri."
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:278
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3918,7 +3874,7 @@ msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:286
 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"
@@ -3927,26 +3883,26 @@ msgstr ""
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: ../src/common/config.py:288
+#: ../src/common/config.py:287
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако је омогућено, постави последњи коришћени статус."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:292
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако је онемогућено, не потписуј присуство са GPG кључем, чак иако је GPG "
 "конфигурисан."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:294
 msgid "Enable ESessions encryption for this account."
 msgstr "Омогући ESessions енкрипцију за овај налог."
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:295
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Да ли ће Гајим аутоматски стартовати шифровану сесију ако је могуће?"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:296
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -3954,21 +3910,21 @@ msgstr ""
 "Уређена листа (одвојена зарезима) типова конекције за пробу. Може садржати "
 "tls, ssl или plain"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:297
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:298
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:300
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:312
 msgid ""
 "How many seconds to wait for the answer of keepalive packet before we try to "
 "reconnect."
@@ -3977,11 +3933,11 @@ msgstr ""
 "поновно успостављање везе."
 
 #. yes, no, ask
-#: ../src/common/config.py:317
+#: ../src/common/config.py:316
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 привремено решење"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:320
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3989,19 +3945,19 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:334
 msgid "Answer to receipt requests"
 msgstr "Одговор на захтев примања"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:335
 msgid "Sent receipt requests"
 msgstr "Послати захтев примања"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:389
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:391
+#: ../src/common/config.py:390
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4009,101 +3965,101 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:392 ../src/common/config.py:395
+#: ../src/common/config.py:391 ../src/common/config.py:394
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:400
 msgid "all or space separated status"
 msgstr "све или размаком одвојен статус"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:401
 msgid "'yes', 'no', or 'both'"
 msgstr "'да', 'не', или 'обоје'"
 
-#: ../src/common/config.py:403 ../src/common/config.py:405
-#: ../src/common/config.py:406 ../src/common/config.py:409
-#: ../src/common/config.py:410
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
 msgid "'yes', 'no' or ''"
 msgstr "'да', 'не' или ''"
 
-#: ../src/common/config.py:416 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:418 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:418
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:418
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:420 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:419
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:420
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:420
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:421
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:421
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:425
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:426
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:428 ../src/config.py:1398
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:429
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:431 ../src/common/config.py:432
+#: ../src/common/config.py:430 ../src/common/config.py:431
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:441
 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."
@@ -4112,23 +4068,23 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:442
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:452 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:456 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
 msgid "marine"
 msgstr "морска"
 
@@ -4151,25 +4107,38 @@ msgstr "Невалидна локална адреса? :-O"
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:926
-#: ../src/common/connection_handlers.py:1839
-#: ../src/common/connection_handlers.py:1879
-#: ../src/common/connection_handlers.py:2061
-#: ../src/common/connection_handlers.py:2180 ../src/common/connection.py:1220
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:851
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: ../src/common/connection_handlers.py:1948
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
+"уклоните (историјат порука ће бити изгубљен)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Недозвољен надимак: %s "
@@ -4177,70 +4146,70 @@ msgstr "Недозвољен надимак: %s "
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2023
-#: ../src/common/connection_handlers.py:2026
-#: ../src/common/connection_handlers.py:2029
-#: ../src/common/connection_handlers.py:2032
-#: ../src/common/connection_handlers.py:2036 ../src/gajim.py:554
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: ../src/common/connection_handlers.py:2024
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Забрањен Вам је приступ овом групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2027
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групни разговор.%s не постоји."
 
-#: ../src/common/connection_handlers.py:2030
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: ../src/common/connection_handlers.py:2033
+#: ../src/common/connection_handlers.py:2063
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2037
+#: ../src/common/connection_handlers.py:2067
 #, 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:2072
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: ../src/common/connection_handlers.py:2079
+#: ../src/common/connection_handlers.py:2116
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: ../src/common/connection_handlers.py:2106
+#: ../src/common/connection_handlers.py:2143
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2127
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "сада сте претплаћени на %s"
 
-#: ../src/common/connection_handlers.py:2129
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "захтев за укидање претплате од контакта %s"
 
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "сада Вам је укинута претплата од контакта %s"
 
-#: ../src/common/connection_handlers.py:2299
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4250,213 +4219,213 @@ msgstr ""
 "Употребите алате као што је http://jru.jabberstudio.org/ да бисте га уклонили"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2324
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "Лозинка за OpenPGP није унета"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2326
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1921 ../src/roster_window.py:1941
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Повезаћете се на %s без OpenPGP кључа."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:343
+#: ../src/common/connection.py:341
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: ../src/common/connection.py:524
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:713
-#: ../src/common/connection.py:1349
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1050
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:645 ../src/common/connection.py:693
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:646 ../src/common/connection.py:694
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:668
+#: ../src/common/connection.py:666
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4465,7 +4434,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:673
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4474,24 +4443,24 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Проверите Вашу конекцију или покушајте касније"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Аутентикација са \"%s\" неуспешна"
 
-#: ../src/common/connection.py:741
+#: ../src/common/connection.py:739
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:802
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:803
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4500,12 +4469,12 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1095
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
 
-#: ../src/common/connection.py:1097
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4513,11 +4482,11 @@ msgstr "Кључ контакта (%s) не поклапа се са кључе�
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1106
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
 
-#: ../src/common/connection.py:1210
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4527,32 +4496,32 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1382
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Посматрачи"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:800 ../src/roster_window.py:834
-#: ../src/roster_window.py:1461 ../src/roster_window.py:1528
-#: ../src/roster_window.py:1530 ../src/roster_window.py:1667
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Преноси"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Није у листи контаката"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На овом рачунару недостају python везивања за D-Bus"
 
-#: ../src/common/dbus_support.py:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus могућности Гајима се не могу користити"
 
@@ -4732,206 +4701,206 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: ../src/common/helpers.py:161
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Потребна је адреса сервера."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: ../src/common/helpers.py:172
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Доступан"
 
-#: ../src/common/helpers.py:280 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Доступан"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Није на вези"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Обоје"
 
-#: ../src/common/helpers.py:322
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Учесници"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Учесник"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Члан"
 
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: ../src/common/helpers.py:399
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:405
 msgid "is composing a message..."
 msgstr "пише поруку..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: ../src/common/helpers.py:406
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
-#: ../src/common/helpers.py:987 ../src/common/helpers.py:994
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4939,22 +4908,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: ../src/common/helpers.py:1000
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " из собе %s"
 
-#: ../src/common/helpers.py:1003 ../src/common/helpers.py:1022
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr " од корисника %s"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " од %s"
 
-#: ../src/common/helpers.py:1012 ../src/common/helpers.py:1019
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4962,22 +4931,22 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: ../src/common/helpers.py:1052
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: не могу отворити %s за читање"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -4990,516 +4959,650 @@ msgstr "Гајим налог %s"
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Одушевљен"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Напаљен"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Љут"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Изнервиран"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Анксиозан"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Напаљен"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Посрамљен"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Сморен"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Храбар"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Миран"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Заинтересован"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Смрзнут"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Садржај"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Збуњен"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Задовољан"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Задовољан"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "На крају живаца"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "На крају живаца"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Деактивирано"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Заинтересован"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Обриши"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Депресиван"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Разочаран"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Згађен"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Онемогућено"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Ометен"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Embarrassed"
 msgstr "Постиђен"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Анксиозан"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Узбуђен"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "За флертовање"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Фрустриран"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Вози"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Мргудан"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Крив"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Срећан"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Наложен"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Скроман"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Понижен"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Гладан"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Повређен"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Импресиониран"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "Очаран"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Заљубљен"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Озлојеђен"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Заинтересован"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Отрован"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Непобедив"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Љубоморан"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Усамљен"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Хост:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Злобан"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Расположен"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Нервозан"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Неутралан"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Увређен"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Фрустриран"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Играо би се"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Поносан"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Олакшан"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Олакшан"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Самилостан"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Неуморан"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Тужан"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Саркастичан"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Задњи пут измењено:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Озбиљан"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Стидљив"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Болестан"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Поспан"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Под стресом"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Изненађен"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Жедан"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Замишљен"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Време"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "девет"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Забринут"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Обавља рутину"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Купује намирнице"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Чисти"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Кува"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Обавља одржавање"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Пере судове"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Пере веш"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Баштовани"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "На задатку"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Шета пса"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Пије"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Пије пиво"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Пије кафу"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Пије чај"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Ужина"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Доручкује"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Руча"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Вечера"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Вежба"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Вози бициклу"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Чисти"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Шета"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Џогира"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Бави се спортом"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Трчи"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Скија"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Плива"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Вежба"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Чешља се"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "У бањи"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Пере зубе"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Шиша се"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Брије се"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Купа се"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Тушира се"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Састанчи"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Слободан дан"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Блеји"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Шета"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "На одмору"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "На проводу"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Заказани одмор"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Пије"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Одмара се"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Шета"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Игра игрице"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Излази напоље"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "На проводу"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Чита"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Увежбава"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "У шопингу"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Скија"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Дружи се"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Сунча се"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Гледа ТВ"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Гледа филм"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Прича"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "У стварном животу"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Телефонира"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "На видео телефону"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Путује"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Мува се"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Вози"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "У колима"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "У аутобусу"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "У авиону"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "У возу"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "На путу"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Шета"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Програмира"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "На састанку"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Учи"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Пише"
 
@@ -5637,12 +5740,12 @@ msgstr "Увек користи апликацију коју оперативн
 msgid "Custom"
 msgstr "Кориснички"
 
-#: ../src/config.py:651 ../src/dialogs.py:1191
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:652
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5651,251 +5754,251 @@ msgstr ""
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
 
-#: ../src/config.py:1017
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: ../src/config.py:1017
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "текст статусне поруке"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Следећа Примљена Порука Фокусирана"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Следећа Примљена Порука Нефокусирана"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
 
-#: ../src/config.py:1059
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
 
-#: ../src/config.py:1060
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Порука Послата"
 
-#: ../src/config.py:1061
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: ../src/config.py:1062
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: ../src/config.py:1063
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
 
 #. Name column
-#: ../src/config.py:1320 ../src/dialogs.py:1815 ../src/dialogs.py:1879
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
 #: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
-#: ../src/history_window.py:86
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: ../src/config.py:1407
+#: ../src/config.py:1406
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: ../src/config.py:1532 ../src/config.py:1631
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
 
-#: ../src/config.py:1667 ../src/config.py:1710
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
 
-#: ../src/config.py:1668
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: ../src/config.py:1694
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: ../src/config.py:1695
+#: ../src/config.py:1694
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
 
-#: ../src/config.py:1711
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
 
-#: ../src/config.py:1717
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
 
-#: ../src/config.py:1718
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
 
-#: ../src/config.py:1722 ../src/config.py:1726
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
 
-#: ../src/config.py:1723
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
 
-#: ../src/config.py:1727
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:1801
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:1802
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:1820 ../src/config.py:1828 ../src/config.py:1871
-#: ../src/config.py:3090 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/config.py:1829
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2020 ../src/config.py:3163
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2041
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2042
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Дошло је до проблема у узимању Ваших OpenPGP тајних кључева."
 
-#: ../src/config.py:2077
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2078
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
 
-#: ../src/config.py:2097 ../src/dialogs.py:1667 ../src/dialogs.py:1803
-#: ../src/dialogs.py:1982 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/config.py:2098
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2102
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2135
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2318
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2320
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2356
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2359
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2408 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2421
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2425
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2450
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2452
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5903,11 +6006,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2454
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2455
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5915,11 +6018,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2457
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2458
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5927,11 +6030,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2460
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2461
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5939,7 +6042,7 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2462
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5955,83 +6058,83 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2559
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2581 ../src/gajim.py:1419 ../src/roster_window.py:1933
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1907
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2583 ../src/roster_window.py:1934
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2593
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2689
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:2691
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2759
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:2793
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
-#: ../src/config.py:3073
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
 
-#: ../src/config.py:3075
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3101
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Дуплирај Џабер ИД"
 
-#: ../src/config.py:3102
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Овај налог је већ конфигурисан у Гајиму."
 
-#: ../src/config.py:3119
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3120 ../src/config.py:3309
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6040,24 +6143,24 @@ msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3138
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
-#: ../src/config.py:3139
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3190 ../src/gajim.py:1991
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3191 ../src/gajim.py:1992
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3259
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6072,7 +6175,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3265 ../src/gajim.py:2015
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6083,23 +6186,23 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3288 ../src/config.py:3327
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3308
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3412
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/conversation_textview.py:548
+#: ../src/conversation_textview.py:549
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6109,7 +6212,7 @@ msgstr ""
 "стигла на други крај. Ако ова икона остане овако \n"
 "дуго времена, вероватно је да се порука изгубила."
 
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6117,51 +6220,56 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:677
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:694
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:711
+#: ../src/conversation_textview.py:712
 #, 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:724
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:727
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:733
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
-#: ../src/conversation_textview.py:1218
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "грешка приликом слања %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1222
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Пре %i дана"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1256
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6210,127 +6318,127 @@ msgstr "ИД Кључа"
 msgid "Contact name"
 msgstr "Име контакта"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Сними као већ постављену статусну поруку"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "АИМ адреса:"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "ГГ Број:"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Број:"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN адреса:"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адреса:"
 
-#: ../src/dialogs.py:711
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:713
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:870 ../src/dialogs.py:876 ../src/dialogs.py:881
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:877
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:896
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:933
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "ГТК+ џабер клијент"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1003
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1005
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035
 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:1030
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6343,88 +6451,88 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1596
+#: ../src/dialogs.py:1614
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:1599
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:1660 ../src/gajim.py:2594
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:1758
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1435
-#: ../src/groupchat_control.py:1716
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/dialogs.py:1763 ../src/dialogs.py:1769
-#: ../src/groupchat_control.py:1883
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:1764 ../src/dialogs.py:1770
-#: ../src/groupchat_control.py:1884
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:1777
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:1804
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:1818
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:1851
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:1852
+#: ../src/dialogs.py:1870
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:1937
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6433,275 +6541,275 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1961 ../src/dialogs.py:2335 ../src/dialogs.py:2478
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
 #: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:1962 ../src/dialogs.py:2336 ../src/dialogs.py:2479
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
 #: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:1971 ../src/dialogs.py:1974
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:1974
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2002
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2002
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2006
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2007
+#: ../src/dialogs.py:2025
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2046 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: ../src/dialogs.py:2048 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #. chat message
-#: ../src/dialogs.py:2050 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Нова Порука"
 
 #. single message
-#: ../src/dialogs.py:2050 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
 #. private message
-#: ../src/dialogs.py:2051 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: ../src/dialogs.py:2051 ../src/gajim.py:1582 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2053 ../src/gajim.py:1648 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2055 ../src/gajim.py:1548 ../src/gajim.py:1615
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2057 ../src/gajim.py:1690 ../src/gajim.py:1712
-#: ../src/gajim.py:1729 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2058 ../src/gajim.py:1693 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1440 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: ../src/dialogs.py:2062 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: ../src/dialogs.py:2254 ../src/normal_control.py:241
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2256 ../src/normal_control.py:243
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2258 ../src/normal_control.py:245
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2261 ../src/normal_control.py:248
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2284 ../src/normal_control.py:290
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2307 ../src/normal_control.py:324
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, 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:2379 ../src/normal_control.py:692
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2380 ../src/normal_control.py:696
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:2424
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:2426
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Конзола"
 
-#: ../src/dialogs.py:2550
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2554
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:2610
+#: ../src/dialogs.py:2628
 #, 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:2615
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:2657
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:2744
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:2842
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:2912
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:2913
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:2945
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:2948
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:2950
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:3015
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:3025 ../src/dialogs.py:3076
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:3063
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:3146
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:3148
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
 #. # means number
-#: ../src/dialogs.py:3219
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3225
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Услов"
 
-#: ../src/dialogs.py:3343
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "када сам "
 
-#: ../src/dialogs.py:3818
+#: ../src/dialogs.py:3836
 #, fuzzy, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6712,19 +6820,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска (КАН) ове сесије је: %(sas)s"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:3828 ../src/dialogs.py:3915
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3854
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3841
+#: ../src/dialogs.py:3859
 #, fuzzy
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
@@ -6734,20 +6842,20 @@ msgstr ""
 "Да бисте били сигурни да само очекиване особе могу да читају Ваше поруке или "
 "да Вам шаљу поруке, морате потврдити њихов идентитет."
 
-#: ../src/dialogs.py:3844 ../src/dialogs.py:3896 ../src/dialogs.py:3909
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3851
+#: ../src/dialogs.py:3869
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3863
+#: ../src/dialogs.py:3881
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет удаљеног контакта?"
 
-#: ../src/dialogs.py:3864
+#: ../src/dialogs.py:3882
 #, fuzzy, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6761,26 +6869,26 @@ msgstr ""
 "исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска (КАН) ове сесије: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3865
+#: ../src/dialogs.py:3883
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Да ли сте разговарали са контактом и потврдили КАН?"
 
-#: ../src/dialogs.py:3897
+#: ../src/dialogs.py:3915
 #, fuzzy, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Кључ контакта (%s) не поклапа се са кључем придруженим у Гајиму."
 
-#: ../src/dialogs.py:3903
+#: ../src/dialogs.py:3921
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3910
+#: ../src/dialogs.py:3928
 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:3916
+#: ../src/dialogs.py:3934
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7157,138 +7265,138 @@ msgstr "Време"
 msgid "Progress"
 msgstr "Напредак"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Име датотеке: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:600
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
 #: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Примаоц: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сачувано у: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Пренос датотеке прекинут"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Примаоц: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Пренос датотеке је заустављен од контакта са друге стране"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Одаберите датотеку за слање..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Гајим не може приступити овој датотеци"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ову датотеку користи неки други процес."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Датотека: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Вам жели послати датотеку:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Датотека са овим именом већ постоји и немате привилегијапреписати је."
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Сними датотеку као..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7296,32 +7404,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:530
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:570 ../src/filetransfers_window.py:573
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Неисправна датотека"
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Датотека: "
 
-#: ../src/filetransfers_window.py:574
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:598 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: ../src/filetransfers_window.py:786
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Пауза"
 
@@ -7399,25 +7507,25 @@ msgstr ""
 "Једна инстанца Гајима изгледа већ ради\n"
 "Свеједно желите покренути?"
 
-#: ../src/gajim.py:491
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: ../src/gajim.py:492
+#: ../src/gajim.py:494
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
 #. ask again
-#: ../src/gajim.py:507
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: ../src/gajim.py:508
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
 
-#: ../src/gajim.py:555
+#: ../src/gajim.py:557
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7428,50 +7536,50 @@ msgstr ""
 "регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: ../src/gajim.py:569
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: ../src/gajim.py:571
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: ../src/gajim.py:574
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: ../src/gajim.py:622 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: ../src/gajim.py:928 ../src/gajim.py:932
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:942 ../src/gajim.py:955
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:987
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: ../src/gajim.py:988
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: ../src/gajim.py:1007
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7479,74 +7587,74 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: ../src/gajim.py:1049
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: ../src/gajim.py:1225 ../src/groupchat_control.py:1146
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: ../src/gajim.py:1240 ../src/groupchat_control.py:1321
-#: ../src/history_window.py:410 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s је тренутно %(status)s"
 
-#: ../src/gajim.py:1303
+#: ../src/gajim.py:1305
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1367 ../src/groupchat_control.py:1106
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: ../src/gajim.py:1372
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
 "корисника)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1378
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Логовање у соби је сада омогућено"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Логовање у соби је сада онемогућено"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: ../src/gajim.py:1420
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
 
-#: ../src/gajim.py:1454
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7554,20 +7662,20 @@ msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: ../src/gajim.py:1456
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Ваша лозинка није тачна"
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нови е-мејл за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1561
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7575,7 +7683,7 @@ msgstr[0] "Имате %d нови е-мејл разговор"
 msgstr[1] "Имате %d нова е-мејл разговора"
 msgstr[2] "Имате %d нових е-мејл разговора"
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7590,34 +7698,34 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1645
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gajim.py:1713
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1717
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: ../src/gajim.py:1730
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1734
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7626,36 +7734,36 @@ msgstr ""
 "Не могу да дешифрујем поруку од контакта %s\n"
 "Можда је промењена."
 
-#: ../src/gajim.py:1825
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: ../src/gajim.py:1896
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: ../src/gajim.py:1897
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: ../src/gajim.py:1909
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gajim.py:1922
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s s.)"
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gajim.py:1958
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: ../src/gajim.py:1959
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7663,11 +7771,11 @@ msgstr ""
 "Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
 "ново име ресурса"
 
-#: ../src/gajim.py:2012
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: ../src/gajim.py:2013
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7678,15 +7786,15 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7702,11 +7810,11 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: ../src/gajim.py:2056 ../src/gajim.py:2086
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: ../src/gajim.py:2057
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7714,16 +7822,16 @@ msgstr ""
 "Управо ћете послати лозинку преко нешифроване везе. Јесте ли сигурни да "
 "желите то да урадите?"
 
-#: ../src/gajim.py:2059 ../src/gajim.py:2089
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: ../src/gajim.py:2060 ../src/gajim.py:2090 ../src/groupchat_control.py:1825
-#: ../src/roster_window.py:3780
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "_Не питај ме више"
 
-#: ../src/gajim.py:2087
+#: ../src/gajim.py:2089
 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?"
@@ -7731,27 +7839,27 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gajim.py:2104
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "PEP чвор није уклоњен"
 
-#: ../src/gajim.py:2105
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2552 ../src/gajim.py:2573
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/gajim.py:2553
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: ../src/gajim.py:2574
+#: ../src/gajim.py:2594
 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 "
@@ -7761,65 +7869,57 @@ msgstr ""
 "emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
 "више детаља."
 
-#: ../src/gajim.py:2600 ../src/roster_window.py:3310
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2879
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: ../src/gajim.py:2976
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Маркер је већ постављен"
 
-#: ../src/gajim.py:2977
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групни разговор \"%s\" је већ маркиран."
 
-#: ../src/gajim.py:2990
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Маркер успешно додат"
 
-#: ../src/gajim.py:2991
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
 "контаката."
 
-#: ../src/gajim.py:3180
-msgid "Network Manager support not available"
-msgstr "Подршка за управитеља мреже није доступна"
-
-#: ../src/gajim.py:3305
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Подршка за управљање сесијама није доступна (недостаје gnome.ui модул)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Приказује помоћ за одређену наредбу"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "наредба"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Приказује или скрива прозор листе контаката "
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7827,49 +7927,49 @@ msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "налог"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Мења статус једног или више налога"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "порука"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "статусна порука"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7878,19 +7978,19 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Приказује дијалог разговора како бисте могли разговарати са контактом"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "Џабер ИД контакта са којим желите разговарати"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7900,29 +8000,29 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "садржај поруке"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp кључ"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7932,135 +8032,135 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "тема поруке"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "датотека"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
 "поставити"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "кључ"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Додаје контакт на листу"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "џид"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Додаје нови контакт овом рачуну"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отвара дијалог за започињање разговора"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Започиње разговор, користећи овај налог"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8068,67 +8168,67 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Управља xmpp:/ uri-јем"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr "URI за управљање"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Налог у коме желите да управљате њиме"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Придружи се новој соби"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "соба"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "Џабер ID собе:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "надимак"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Надимак за коришћење"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "лозинка"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Лозинка за улазак у собу"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Налог са кога желите да уђете у собу"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: ../src/gajim-remote.py:326
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8137,15 +8237,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote.py:329
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote.py:381
+#: ../src/gajim-remote.py:380
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8154,16 +8254,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8172,7 +8272,7 @@ msgstr ""
 "Коришћење: %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: ../src/gajim-remote.py:494
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8181,7 +8281,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:499
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8190,7 +8290,7 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:518
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Лош uri"
 
@@ -8230,137 +8330,137 @@ msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Више нисте у групном разговору \"%(room)s\" или је \"%(nick)s\" отишао."
 
-#: ../src/groupchat_control.py:438
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:590
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:592
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
-#: ../src/groupchat_control.py:1009
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Стварно пошаљи датотеку?"
 
-#: ../src/groupchat_control.py:1010
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ако пошаљете датотеку контакту %s, он/она ће знати Ваш прави џабер ID."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1111
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1114
+#: ../src/groupchat_control.py:1132
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1120
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1124
+#: ../src/groupchat_control.py:1142
 #, 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:1131
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1135
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1186
-#: ../src/groupchat_control.py:1191
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1183
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1188
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1193
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1280
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1266
+#: ../src/groupchat_control.py:1284
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1299
 #, 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:1285
+#: ../src/groupchat_control.py:1303
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1319
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1434 ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/groupchat_control.py:1458 ../src/groupchat_control.py:1476
-#: ../src/groupchat_control.py:1560 ../src/groupchat_control.py:1577
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Надимак није пронађен: %s "
 
-#: ../src/groupchat_control.py:1492
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Овај групни разговор нема тему"
 
-#: ../src/groupchat_control.py:1503
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Позвали сте %(contact_jid)s у собу %(room_jid)s"
 
-#: ../src/groupchat_control.py:1638
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8373,14 +8473,14 @@ msgstr ""
 "ИД тренутно у соби, он/она ће бити избачен(а). Размаци у именима НИСУ "
 "подржани."
 
-#: ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr "Начин коришћења: /%s <надимак>, отвара приватни разговор са учесником."
 
-#: ../src/groupchat_control.py:1651
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8389,7 +8489,7 @@ msgstr ""
 "Начин коришћења: /%s [разлог], затвара тренутни прозор или језичак, и "
 "приказује разлог ако је назначен."
 
-#: ../src/groupchat_control.py:1657
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8398,7 +8498,7 @@ msgstr ""
 "Начин коришћења: /%s ЏИД> [разлог], позива Џабер ИД у тренутни групни "
 "разговор, опционо дајући разлог."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8407,7 +8507,7 @@ msgstr ""
 "Начин коришћења: /%s <соба>@<сервер>[/надимак], нуди могућност спајања на "
 "соба@сервер користећи наведени надимак."
 
-#: ../src/groupchat_control.py:1665
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8418,7 +8518,7 @@ msgstr ""
 "из групног разговора и опционо приказује разлог. НЕ подржава бланко знакове "
 "у надимку."
 
-#: ../src/groupchat_control.py:1674
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8427,64 +8527,64 @@ msgstr ""
 "Начин коришћења: /%s <надимак> [порука], отвара прозор приватне поруке и "
 "шаље поруку учеснику са задатим надимком."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
 "разговору."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Начин коришћења: /%s , приказује имена учесника у групном разговору."
 
-#: ../src/groupchat_control.py:1687
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Начин коришћења: /%s [тема], приказује или ажурира тему групног разговора."
 
-#: ../src/groupchat_control.py:1690
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Начин коришћења: /%s <порука>, шаље поруку не гледајући остале команде."
 
-#: ../src/groupchat_control.py:1819
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1821
+#: ../src/groupchat_control.py:1839
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1859
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1863
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1864
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1890
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1891
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8492,22 +8592,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1893
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2065
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:2066 ../src/groupchat_control.py:2370
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2369
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -8590,7 +8690,7 @@ msgstr "Контакти"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Датум"
 
@@ -8601,7 +8701,7 @@ msgstr "Надимак"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Порука"
 
@@ -8654,22 +8754,27 @@ msgstr[0] "Да ли заиста желите да избришете озна�
 msgstr[1] "Да ли заиста желите да избришете означене поруке?"
 msgstr[2] ""
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Историјат разговора са %s"
 
-#: ../src/history_window.py:406
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Грешка при упису на диск"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s је тренутно %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:416
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:419
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
@@ -8706,42 +8811,42 @@ msgstr "- поруке ће бити логоване"
 msgid "- messages will not be logged"
 msgstr "- поруке неће бити логоване"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нова самостална порука од контакта %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нова приватна порука са групног разговора %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
@@ -8754,18 +8859,18 @@ msgstr "Опште"
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2773
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2776
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2778 ../src/roster_window.py:2789
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
@@ -8797,38 +8902,38 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:961
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1882
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1895
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8836,15 +8941,15 @@ msgstr ""
 "Gnome Keyring је инсталиран, али није \t\t\t\t\t\t\tправилно стартован"
 "(променљиве окружења вероватно нису \t\t\t\t\t\t\tправилно подешене)"
 
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:2109 ../src/roster_window.py:3253
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2110 ../src/roster_window.py:3254
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8852,15 +8957,15 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2136
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2270 ../src/roster_window.py:2507
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2271
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8868,16 +8973,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2508
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2511
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2512
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8885,11 +8990,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2515
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2520
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8899,52 +9004,52 @@ msgstr ""
 "транспорта: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2719
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2721
+#: ../src/roster_window.py:2735
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклони и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2760
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2761
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3114
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3118
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8953,12 +9058,12 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3123
+#: ../src/roster_window.py:3137
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8966,16 +9071,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3130
+#: ../src/roster_window.py:3144
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3134
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3138
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8985,21 +9090,21 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3177
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3178
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:3694
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:3696
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9007,13 +9112,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:3774
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:3776
+#: ../src/roster_window.py:3786
 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 "
@@ -9023,11 +9128,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:3889
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3910
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9040,123 +9145,123 @@ msgstr[2] "Да ли желите послати ове датотеке кон�
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4577 ../src/roster_window.py:4648
-#: ../src/roster_window.py:4657 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
 #: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4664
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4669
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:4706 ../src/systray.py:303
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4726
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:4766
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:4828 ../src/roster_window.py:4937
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:4855
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:4862
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Расположење"
 
-#: ../src/roster_window.py:4866
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Активност"
 
-#: ../src/roster_window.py:4871
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5025
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
 #. Send Group Message
-#: ../src/roster_window.py:5033 ../src/roster_window.py:5558
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5041
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5045
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
-#: ../src/roster_window.py:5455
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Желео бих Вас додати на моју листу контаката"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5578
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
 #. Send single message
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5703
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
-#: ../src/roster_window.py:5778
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5785
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
-#: ../src/roster_window.py:5865
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Нови групни разговор"
 
 #. History manager
-#: ../src/roster_window.py:5978
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:5987 ../src/systray.py:341
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:6197
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
@@ -9182,11 +9287,11 @@ msgstr "Грешка при упису на диск"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:399 ../src/session.py:434
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
-#: ../src/session.py:401
+#: ../src/session.py:400
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9201,7 +9306,7 @@ msgstr ""
 "\n"
 "\t\tДа ли су ове ставке прихватљиве?"
 
-#: ../src/session.py:435
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9341,24 +9446,24 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Клијент:Непознат"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "од %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9366,7 +9471,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9374,13 +9479,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
 #. None
-#: ../src/vcard.py:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9388,18 +9493,59 @@ msgstr ""
 "Не интересује Вас присутност контакта, нити Ваша присутност интересује њега/"
 "њу"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Укључи/искључи Open_PGP енкрипцију"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s није емитовао OpenPGP кључ, нити му је иједан додељен"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Не постоји команда: /%s (ако желите да пошаљете то као поруку, "
+#~ "префиксирајте је са /say)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
+#~ "разговору. Користититреће лице. (нпр. /%(command)s је експлодирао.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E енкрипција омогућена"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E енкрипција онемогућена"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "Корисничко име за Last.fm налог."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Замишљен"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Подршка за управитеља мреже није доступна"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Подршка за управљање сесијама није доступна (недостаје gnome.ui модул)"
+
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index b570cf25c..92f3388eb 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: 2008-08-25 11:26+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2008-08-15 22:36+0200\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -33,7 +33,7 @@ msgid "Jabber IM Client"
 msgstr "Džaber IM Klijent"
 
 #: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
 msgstr "Priključi se _grupnom razgovoru..."
 
@@ -294,9 +294,9 @@ msgstr "Izmeni lične informacije"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1030
-#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -305,11 +305,11 @@ msgstr "Gajim"
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2690
-#: ../src/roster_window.py:5170
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Opšte"
 
@@ -374,20 +374,20 @@ msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2045
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1953 ../src/config.py:2031 ../src/config.py:2044
-#: ../src/config.py:3147 ../src/config.py:3215 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2758
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2769
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ništa"
 
@@ -550,7 +550,7 @@ msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
 msgid "Jabber ID:"
 msgstr "Džaber ID:"
 
@@ -565,7 +565,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji naloge"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5122
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
 msgid "Re_name"
 msgstr "Prei_menuj"
 
@@ -784,7 +784,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:277
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Odsutan"
 
@@ -801,7 +801,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -810,7 +810,7 @@ msgid "Launch a command"
 msgstr "Pokrenite komandu"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -987,7 +987,7 @@ msgid "Join _Group Chat"
 msgstr "Priključi se _grupnom razgovoru"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
 msgstr "_Dodaj na listu kontakata..."
 
@@ -1039,10 +1039,10 @@ msgstr "_Dodaj na listu kontakata"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5797
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Istorijat"
 
@@ -1151,7 +1151,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Nastavi"
 
@@ -1159,7 +1159,7 @@ msgstr "_Nastavi"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "_Otvori sadržavajuću fasciklu"
 
@@ -1207,7 +1207,7 @@ msgstr "Personalizacija Gajim tema"
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Neaktivno"
 
@@ -1315,7 +1315,7 @@ msgstr "_Glas"
 msgid "Create new post"
 msgstr "Napravi novu objavu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Od"
 
@@ -1370,7 +1370,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Pretraži bazu podataka"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Istorijat razgovora"
 
@@ -1393,7 +1393,7 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1696
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
@@ -1420,8 +1420,8 @@ msgstr "Nedavno:"
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182
-#: ../src/disco.py:1603
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Pridruži se"
 
@@ -1523,7 +1523,8 @@ 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 (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
 msgstr "Promeni temu sobe (Ctrl+T)"
 
 #: ../data/glade/message_window.glade.h:5
@@ -1553,7 +1554,7 @@ msgstr "Prikaži profil kontakta (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Pošalji"
 
@@ -1719,10 +1720,6 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Smajliji:"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1732,7 +1729,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1742,7 +1739,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1750,11 +1747,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:51
+#: ../data/glade/preferences_window.glade.h:50
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij svu dugmad u prozoru razgovora"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1762,7 +1759,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1770,14 +1767,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:54
+#: ../data/glade/preferences_window.glade.h:53
 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:55
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1785,7 +1782,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:56
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1793,7 +1790,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1801,26 +1798,26 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
 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:59
+#: ../data/glade/preferences_window.glade.h:58
 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:60
+#: ../data/glade/preferences_window.glade.h:59
 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:61
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1831,7 +1828,7 @@ msgstr ""
 "polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
 "grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1840,7 +1837,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:63
+#: ../data/glade/preferences_window.glade.h:62
 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 "
@@ -1850,7 +1847,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:64
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1858,15 +1855,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:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"Ako je označeno, Gajim će sortirati avatare kontakata u listi kontakata po "
-"statusu, a ne po prikazanom imenu"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
 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, "
@@ -1875,7 +1864,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:67
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1883,7 +1872,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:68
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1891,47 +1880,43 @@ 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:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignoriši bogato formatirani sadržaj u pristiglim porukama"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Log _encrypted chat session"
 msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Ma_ke message windows compact"
 msgstr "Načini prozor poruke kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_nage..."
 msgstr "Pode_si..."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Notify on new _GMail email"
 msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Personal Events"
 msgstr "Lični događaji"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Play _sounds"
 msgstr "Puštaj zvukove"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1941,19 +1926,19 @@ msgstr ""
 "Obavesti me o tome\n"
 "Prikaži samo u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Prijavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "Odjavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1961,23 +1946,28 @@ 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:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sortiraj kontakte po statusu"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Status _iconset:"
 msgstr "Skup statusnih ikona:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
@@ -1985,7 +1975,7 @@ msgstr ""
 "Auto statusna poruka pri odsutnosti. Ako je prazno, Gajim neće izmeniti "
 "trenutnu statusnu poruku"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
@@ -1993,42 +1983,52 @@ msgstr ""
 "Auto statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće izmeniti "
 "trenutnu statusnu poruku"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Use _transports icons"
 msgstr "Koristi ikone za _transporte"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Koristi sistemski podrazumevano"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
 msgid "When new event is received:"
 msgstr "Kada se primi novi događaj:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Away after:"
 msgstr "Autom_atski odsutan posle:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Display chat state notifications:"
 msgstr "_Prikazana obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Smajliji:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Pregledač datoteka:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Oboji pogrešno napisane reči"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignoriši bogato formatirani sadržaj u pristiglim porukama"
+
 #: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "_Dolazna poruka:"
@@ -2062,22 +2062,28 @@ msgid "_Send chat state notifications:"
 msgstr "Pošalji obaveštenja o stanju razgovora:"
 
 #: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Sortiraj kontakte po statusu"
-
-#: ../data/glade/preferences_window.glade.h:110
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_URL highlight:"
 msgstr "URL osvetljavanje:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Window behavior:"
 msgstr "Ponašanje prozora:"
 
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Priključi se _grupnom razgovoru"
+
 #: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Nije u listi kontakata"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minuta"
 
@@ -2125,7 +2131,7 @@ msgstr "Džaber ID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
@@ -2269,7 +2275,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
 msgid "<b>Role:</b>"
 msgstr "<b>Uloga:</b>"
 
@@ -2329,10 +2335,8 @@ msgstr "Ukloni nalog i iz Gajima i sa servera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5158 ../src/roster_window.py:5615
-#: ../src/roster_window.py:5744
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -2354,59 +2358,64 @@ msgstr "Izmeni _grupe..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Izvrši naredbu..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5077 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5087 ../src/roster_window.py:5653
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Ukloni"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Pošalji jednu _poruku..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
 msgstr "Pošalji _datoteku..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
 msgstr "Postavi korisnički definisan avatar..."
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Započni ra_zgovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli mu/joj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5149 ../src/roster_window.py:5605
-#: ../src/roster_window.py:5734
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
 msgid "_Ignore"
 msgstr "_Ignoriši"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
 msgid "_Manage Contact"
 msgstr "_Upravljanje kontaktima"
@@ -2420,8 +2429,8 @@ msgid "_Subscription"
 msgstr "_Pretplata"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5599
-#: ../src/roster_window.py:5731
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
@@ -2430,45 +2439,46 @@ msgid "_Unignore"
 msgstr "_Poništi ignrisanje"
 
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "Nalo_zi"
-
-#: ../data/glade/roster_window.glade.h:2
 msgid "Add _Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
 msgstr "_Mogućnosti"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
 msgstr "Prenosi da_toteka"
 
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
 msgid "Frequently Asked Questions (online)"
 msgstr "Često postavljana pitanja (internet)"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
 msgid "Help online"
 msgstr "Pomoć sa interneta"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Prikaži trans_porte"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _roster"
 msgstr "_Prikaži listu kontakata"
 
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "Nalozi"
+
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
 #: ../data/glade/subscription_request_window.glade.h:6
@@ -2479,7 +2489,7 @@ msgstr "_Akcije"
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "_Izmeni"
 
@@ -2520,11 +2530,11 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5756
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2742,13 +2752,13 @@ msgstr "Pridruži Open_PGP Ključ"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5596
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5714
+#: ../src/roster_window.py:5722
 msgid "_Rename"
 msgstr "_Preimenuj"
 
@@ -2799,49 +2809,48 @@ msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
 #. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktivirano"
 
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Deaktivirano"
 
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Da/Ne"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Ceo broj"
 
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Ime postavke"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Tip"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(ništa)"
 
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Skriven"
 
@@ -2850,231 +2859,254 @@ msgstr "Skriven"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "Beloruski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Breton"
 msgstr "Bretanski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "Nemački"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Španski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italijanski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Holandski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilski portugalski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Jezik za pravopis"
 
 #. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 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:1142 ../src/chat_control.py:1534
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1164 ../src/chat_control.py:2014
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843
-#: ../src/dialogs.py:896 ../src/gajim.py:1622 ../src/roster_window.py:926
-#: ../src/roster_window.py:1527 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1869 ../src/roster_window.py:5262
-#: ../src/roster_window.py:5439
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1293 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: ../src/chat_control.py:1295 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: ../src/chat_control.py:1297 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: ../src/chat_control.py:1301
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
 #, python-format
-msgid "<b>\"%(title)s\"</b> by "
-msgstr "<b>\"%(title)s\"</b> od "
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"iz <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1308
-#, python-format
-msgid "%(title)s by %(artist)s\n"
-msgstr "%(title)s od %(artist)s\n"
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
+"iz <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
 #, 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:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
 #: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1542 ../src/chat_control.py:1796
-msgid "Session WILL NOT be logged"
-msgstr "Sesija NEĆE biti pamćena"
-
-#: ../src/chat_control.py:1544 ../src/chat_control.py:1794
+#: ../src/chat_control.py:1558
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Sesija NEĆE biti pamćena"
+
 #. encryption %s active
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1568
+#: ../src/chat_control.py:1580
 #, fuzzy
 msgid "and authenticated"
 msgstr "Koristi autentikaciju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1584
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Koristi autentikaciju"
 
-#: ../src/chat_control.py:1575
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1621
+#: ../src/chat_control.py:1638
 msgid "Command not supported for zeroconf account."
 msgstr "Komanda nije podržana za zeroconf  nalog."
 
-#: ../src/chat_control.py:1632 ../src/groupchat_control.py:1524
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
 
-#: ../src/chat_control.py:1635 ../src/groupchat_control.py:1538
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
 
-#: ../src/chat_control.py:1638 ../src/groupchat_control.py:1543
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Način korišćenja: /%s, sakriva dugmad."
 
-#: ../src/chat_control.py:1641 ../src/groupchat_control.py:1559
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3083,52 +3115,68 @@ msgstr ""
 "Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
 "razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1663
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Način korišćenja: /%s, šalje pink kontaktu"
 
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1666
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1582
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
 #, python-format
 msgid "No help info for /%s"
 msgstr "Nema informacija ni pomoći za /%s"
 
-#: ../src/chat_control.py:1783
+#: ../src/chat_control.py:1800
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:1790
-msgid "E2E encryption enabled"
-msgstr "E2E enkripcija omogućena"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Ova poruka je šifrovana]"
 
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Sesija ĆE biti pamćena"
+
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Sesija NEĆE biti pamćena"
+
+#: ../src/chat_control.py:1817
 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:1803
+#: ../src/chat_control.py:1819
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1832 ../src/chat_control.py:1839
-#: ../src/chat_control.py:1845
-msgid "The following message was "
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "Poruka glasi "
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
 msgstr "Poruka glasi "
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2193
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3136,20 +3184,24 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2345 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2346 ../src/gajim.py:171
-#, python-format
+#: ../src/chat_control.py:2377
+#, fuzzy, python-format
 msgid ""
-"The database file (%s) cannot be read. Try to repare it or remove it (all "
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 "Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite ili "
 "uklonite (istorijat poruka će biti izgubljen)."
 
-#: ../src/chat_control.py:2578
+#: ../src/chat_control.py:2608
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
@@ -3219,40 +3271,40 @@ msgstr "Opis prisutnosti:"
 msgid "The status has been changed."
 msgstr "Status se promenio."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
 msgid "Leave Groupchats"
 msgstr "Napusti grupne razgovore"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
 #, 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:195
 msgid "You have not joined a groupchat."
 msgstr "Ppridružili ste se grupnom razgovoru."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
 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:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:794 ../src/roster_window.py:1531
-#: ../src/roster_window.py:1533 ../src/roster_window.py:5047
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sledeće grupne razgovore:"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
 msgid "Forward unread messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su prosleđene."
 
@@ -3297,20 +3349,20 @@ msgstr ""
 
 #. sorted alphanum
 #: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3087
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
 msgid "default"
 msgstr "podrazumevano"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Omogući lokalnu vezu/zeroconf poruke"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
 msgid "Language used by speller"
 msgstr "Jezik koji koristi pravopis"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3320,7 +3372,7 @@ msgstr ""
 "'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikad' - nikad ne ispisuj vreme."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 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. "
@@ -3331,18 +3383,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje_vremena "
 "postavnjeno na 'ponekad'."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3353,7 +3405,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ako želite da koristite ovo, instalirajte "
 "docutils)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3361,7 +3413,7 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3369,7 +3421,7 @@ msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3380,18 +3432,14 @@ msgstr ""
 "dokumentaciju za strftime, za punu dokumentaciju: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani pre nadimka u razgovoru"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani posle nadimka u razgovoru"
 
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "Korisničko ime za Last.fm nalog."
-
 #: ../src/common/config.py:168
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste kontakata?"
@@ -3715,7 +3763,10 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Glatko skrolovanje u prozoru razgovora"
 
 #: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 "Lista boja koje će biti korišćene za bojenje nadimaka u grupnim razgovorima."
 
@@ -3937,7 +3988,7 @@ msgstr "'da', 'ne', ili 'oboje'"
 msgid "'yes', 'no' or ''"
 msgstr "'da', 'ne' ili ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Spavam"
 
@@ -3949,7 +4000,7 @@ msgstr "Vraćam se brzo"
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Jedem"
 
@@ -3965,7 +4016,7 @@ msgstr "Film"
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Radim."
 
@@ -3997,7 +4048,7 @@ msgstr "Dostupan sam."
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:427 ../src/config.py:1391
+#: ../src/common/config.py:427 ../src/config.py:1397
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
@@ -4026,11 +4077,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
 msgid "grocery"
 msgstr "namirnice"
 
@@ -4042,7 +4093,7 @@ msgstr "ljudska"
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:71
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
@@ -4056,112 +4107,114 @@ msgstr "Loš host"
 msgid "Invalid local address? :-O"
 msgstr "Nevalidna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:635
+#: ../src/common/connection_handlers.py:639
 #, 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:918
-#: ../src/common/connection_handlers.py:1813
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2162 ../src/common/connection.py:1203
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
 #: ../src/gajim.py:392
 msgid "Disk Write Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:840
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1122 ../src/common/connection.py:841
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1929
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite ili "
+"uklonite (istorijat poruka će biti izgubljen)."
+
+#: ../src/common/connection_handlers.py:1978
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljen nadimak: %s "
 
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2000
-#: ../src/common/connection_handlers.py:2003
-#: ../src/common/connection_handlers.py:2006
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2013
-#: ../src/common/connection_handlers.py:2022
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2001
+#: ../src/common/connection_handlers.py:2054
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2004
+#: ../src/common/connection_handlers.py:2057
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2060
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2063
 #, 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:2014
+#: ../src/common/connection_handlers.py:2067
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
-#: ../src/common/connection_handlers.py:2023
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Vaš željeni nadimak je trenutno u upotrebi u grupnom razgovoru %s ili je "
-"registrovan od strane nekog od učesnika.\n"
-"Molimo odredite drugi nadimak ispod:"
-
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2109
 msgid "Room has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: ../src/common/connection_handlers.py:2061
+#: ../src/common/connection_handlers.py:2116
 #, 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:2088
+#: ../src/common/connection_handlers.py:2143
 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:2109
+#: ../src/common/connection_handlers.py:2164
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada ste pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2111
+#: ../src/common/connection_handlers.py:2166
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2113
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada Vam je ukinuta pretplata od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2275
+#: ../src/common/connection_handlers.py:2343
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4172,203 +4225,213 @@ msgstr ""
 "ga uklonili"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2300
+#: ../src/common/connection_handlers.py:2368
 #: ../src/common/zeroconf/connection_zeroconf.py:172
 msgid "OpenPGP passphrase was not given"
 msgstr "Lozinka za OpenPGP nije uneta"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2370
 #: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Povezaćete se na %s bez OpenPGP ključa."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
 #: ../src/common/zeroconf/connection_zeroconf.py:214
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
 #, 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:314
+#: ../src/common/connection.py:312
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
 #, 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:527
+#: ../src/common/connection.py:522
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:612 ../src/common/connection.py:703
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
 #: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:613 ../src/gajim.py:1040
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:660
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Veza sa \"%s\" nije moguća"
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Izgubljena veza sa računom \"%s\""
+
+#: ../src/common/connection.py:666
 #, 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:663
+#: ../src/common/connection.py:669
 #, python-format
 msgid ""
 "\n"
@@ -4377,7 +4440,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:671
 #, python-format
 msgid ""
 "\n"
@@ -4386,24 +4449,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:704
+#: ../src/common/connection.py:712
 msgid "Check your connection or try again later"
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
 
-#: ../src/common/connection.py:729
+#: ../src/common/connection.py:737
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentikacija sa \"%s\" neuspešna"
 
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:739
 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:792
+#: ../src/common/connection.py:800
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:793
+#: ../src/common/connection.py:801
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4412,12 +4475,12 @@ 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:1084
+#: ../src/common/connection.py:1094
 #: ../src/common/zeroconf/connection_zeroconf.py:381
 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:1086
+#: ../src/common/connection.py:1096
 #: ../src/common/zeroconf/connection_zeroconf.py:383
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4425,11 +4488,11 @@ 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:1095
+#: ../src/common/connection.py:1105
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:1193
+#: ../src/common/connection.py:1217
 #: ../src/common/zeroconf/connection_zeroconf.py:445
 #, python-format
 msgid ""
@@ -4439,32 +4502,32 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1365
+#: ../src/common/connection.py:1395
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117
-#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1523
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1668
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
 msgid "Transports"
 msgstr "Prenosi"
 
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
 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:49
+#: ../src/common/dbus_support.py:48
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
 
@@ -4644,206 +4707,206 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:158
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:163
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:169
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:176
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:216
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:223
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:226
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:230
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:233
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:267
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:269
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:272
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:277
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:270 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:286
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:296
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:299
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:305
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:307
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:312
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:314
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:318
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:326
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:328
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:323
+#: ../src/common/helpers.py:337
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:340
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:342
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:358
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:360
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:362
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:364
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:388
+#: ../src/common/helpers.py:401
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:403
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:392
+#: ../src/common/helpers.py:405
 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:395
+#: ../src/common/helpers.py:408
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:410
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
-#: ../src/common/helpers.py:979 ../src/common/helpers.py:986
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4851,22 +4914,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:992
+#: ../src/common/helpers.py:1005
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:997
+#: ../src/common/helpers.py:1010
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4874,22 +4937,22 @@ 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:1044
+#: ../src/common/helpers.py:1057
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "greška: ne mogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -4902,520 +4965,668 @@ msgstr "Gajim nalog %s"
 msgid "Afraid"
 msgstr "Uplašen"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Amazed"
 msgstr "Oduševljen"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Napaljen"
+
+#: ../src/common/pep.py:32
 msgid "Angry"
 msgstr "Ljut"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
 msgid "Annoyed"
 msgstr "Iznerviran"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
 msgid "Anxious"
 msgstr "Anksiozan"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
 msgid "Aroused"
 msgstr "Napaljen"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
 msgid "Bored"
 msgstr "Smoren"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
 msgid "Brave"
 msgstr "Hrabar"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
 msgid "Calm"
 msgstr "Miran"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Zainteresovan"
+
+#: ../src/common/pep.py:41
 msgid "Cold"
 msgstr "Smrznut"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Sadržaj"
+
+#: ../src/common/pep.py:43
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Zadovoljan"
+
+#: ../src/common/pep.py:45
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
 msgid "Cranky"
 msgstr "Na kraju živaca"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Na kraju živaca"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deaktivirano"
+
+#: ../src/common/pep.py:49
 msgid "Curious"
 msgstr "Zainteresovan"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Obriši"
+
+#: ../src/common/pep.py:51
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Onemogućeno"
+
+#: ../src/common/pep.py:55
 msgid "Distracted"
 msgstr "Ometen"
 
-#: ../src/common/pep.py:38
-msgid "Embarassed"
+#: ../src/common/pep.py:56
+#, fuzzy
+msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Anksiozan"
+
+#: ../src/common/pep.py:58
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
 msgid "Flirtatious"
 msgstr "Za flertovanje"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Vozi"
+
+#: ../src/common/pep.py:63
 msgid "Grumpy"
 msgstr "Mrgudan"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
 msgid "Guilty"
 msgstr "Kriv"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
 msgid "Happy"
 msgstr "Srećan"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
 msgid "Hot"
 msgstr "Naložen"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
 msgid "Humbled"
 msgstr "Skroman"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
 msgid "Hungry"
 msgstr "Gladan"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
 msgid "Hurt"
 msgstr "Povređen"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
 msgid "In Awe"
 msgstr "Očaran"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
 msgid "Indignant"
 msgstr "Ozlojeđen"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
 msgid "Interested"
 msgstr "Zainteresovan"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
 msgid "Intoxicated"
 msgstr "Otrovan"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
 msgid "Invincible"
 msgstr "Nepobediv"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
 msgid "Mean"
 msgstr "Zloban"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
 msgid "Moody"
 msgstr "Raspoložen"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
 msgid "Nervous"
 msgstr "Nervozan"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
 msgid "Offended"
 msgstr "Uvređen"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustriran"
+
+#: ../src/common/pep.py:89
 msgid "Playful"
 msgstr "Igrao bi se"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
 msgid "Proud"
 msgstr "Ponosan"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Olakšan"
+
+#: ../src/common/pep.py:92
 msgid "Relieved"
 msgstr "Olakšan"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
 msgid "Remorseful"
 msgstr "Samilostan"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
 msgid "Restless"
 msgstr "Neumoran"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
 msgid "Sad"
 msgstr "Tužan"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
 msgid "Sarcastic"
 msgstr "Sarkastičan"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Zadnji put izmenjeno:"
+
+#: ../src/common/pep.py:98
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
 msgid "Shy"
 msgstr "Stidljiv"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
 msgid "Sick"
 msgstr "Bolestan"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Zamišljen"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Vreme"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "devet"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
 msgid "Doing Chores"
 msgstr "Obavlja rutinu"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
 msgid "Buying Groceries"
 msgstr "Kupuje namirnice"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
 msgid "Cleaning"
 msgstr "Čisti"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
 msgid "Cooking"
 msgstr "Kuva"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
 msgid "Doing Maintenance"
 msgstr "Obavlja održavanje"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
 msgid "Doing the Dishes"
 msgstr "Pere sudove"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
 msgid "Doing the Laundry"
 msgstr "Pere veš"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
 msgid "Gardening"
 msgstr "Baštovani"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
 msgid "Running an Errand"
 msgstr "Na zadatku"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
 msgid "Walking the Dog"
 msgstr "Šeta psa"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
 msgid "Drinking"
 msgstr "Pije"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
 msgid "Having a Beer"
 msgstr "Pije pivo"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
 msgid "Having Coffee"
 msgstr "Pije kafu"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
 msgid "Having Tea"
 msgstr "Pije čaj"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
 msgid "Having a Snack"
 msgstr "Užina"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
 msgid "Having Breakfast"
 msgstr "Doručkuje"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
 msgid "Having Dinner"
 msgstr "Ruča"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
 msgid "Having Lunch"
 msgstr "Večera"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
 msgid "Exercising"
 msgstr "Vežba"
 
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Vozi biciklu"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Čisti"
+
+#: ../src/common/pep.py:137
 msgid "Hiking"
 msgstr "Šeta"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
 msgid "Jogging"
 msgstr "Džogira"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
 msgid "Playing Sports"
 msgstr "Bavi se sportom"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
 msgid "Running"
 msgstr "Trči"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
 msgid "Skiing"
 msgstr "Skija"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
 msgid "Swimming"
 msgstr "Pliva"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
 msgid "Working out"
 msgstr "Vežba"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
 msgid "Grooming"
 msgstr "Češlja se"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
 msgid "At the Spa"
 msgstr "U banji"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
 msgid "Brushing Teeth"
 msgstr "Pere zube"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
 msgid "Getting a Haircut"
 msgstr "Šiša se"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
 msgid "Shaving"
 msgstr "Brije se"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
 msgid "Taking a Bath"
 msgstr "Kupa se"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
 msgid "Taking a Shower"
 msgstr "Tušira se"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
 msgid "Having an Appointment"
 msgstr "Sastanči"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
 msgid "Day Off"
 msgstr "Slobodan dan"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
 msgid "Hanging out"
 msgstr "Bleji"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Šeta"
+
+#: ../src/common/pep.py:156
 msgid "On Vacation"
 msgstr "Na odmoru"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Na provodu"
+
+#: ../src/common/pep.py:158
 msgid "Scheduled Holiday"
 msgstr "Zakazani odmor"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Pije"
+
+#: ../src/common/pep.py:161
 msgid "Relaxing"
 msgstr "Odmara se"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Šeta"
+
+#: ../src/common/pep.py:163
 msgid "Gaming"
 msgstr "Igra igrice"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
 msgid "Going out"
 msgstr "Izlazi napolje"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
 msgid "Partying"
 msgstr "Na provodu"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
 msgid "Reading"
 msgstr "Čita"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
 msgid "Rehearsing"
 msgstr "Uvežbava"
 
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
 msgid "Shopping"
 msgstr "U šopingu"
 
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Skija"
+
+#: ../src/common/pep.py:170
 msgid "Socializing"
 msgstr "Druži se"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
 msgid "Sunbathing"
 msgstr "Sunča se"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
 msgid "Watching TV"
 msgstr "Gleda TV"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
 msgid "Watching a Movie"
 msgstr "Gleda film"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
 msgid "Talking"
 msgstr "Priča"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
 msgid "In Real Life"
 msgstr "U stvarnom životu"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
 msgid "On the Phone"
 msgstr "Telefonira"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
 msgid "On Video Phone"
 msgstr "Na video telefonu"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
 msgid "Traveling"
 msgstr "Putuje"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
 msgid "Commuting"
 msgstr "Muva se"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
 msgid "Driving"
 msgstr "Vozi"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
 msgid "In a Car"
 msgstr "U kolima"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
 msgid "On a Bus"
 msgstr "U autobusu"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
 msgid "On a Plane"
 msgstr "U avionu"
 
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
 msgid "On a Train"
 msgstr "U vozu"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
 msgid "On a Trip"
 msgstr "Na putu"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
 msgid "Walking"
 msgstr "Šeta"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
 msgid "Coding"
 msgstr "Programira"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
 msgid "In a Meeting"
 msgstr "Na sastanku"
 
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
 msgid "Studying"
 msgstr "Uči"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
 msgid "Writing"
 msgstr "Piše"
 
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Ne mogu da se povežem na port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
+
 #. we're not english
-#: ../src/common/stanza_session.py:282
+#: ../src/common/stanza_session.py:278
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5507,40 +5718,40 @@ msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:319
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:327
+#: ../src/config.py:329
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:410
+#: ../src/config.py:412
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:452
+#: ../src/config.py:454
 msgid "Always use OS/X default applications"
 msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
 
-#: ../src/config.py:453
+#: ../src/config.py:455
 msgid "Custom"
 msgstr "Korisnički"
 
-#: ../src/config.py:643 ../src/dialogs.py:1198
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:644
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5549,251 +5760,251 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1009
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1054
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1056
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:1052
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:1053
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:1055
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
 #. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1822 ../src/dialogs.py:1886
-#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793
-#: ../src/history_window.py:86
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1405
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1401
+#: ../src/config.py:1406
 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:1525 ../src/config.py:1624
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1660 ../src/config.py:1701
+#: ../src/config.py:1666 ../src/config.py:1709
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1667
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1687
+#: ../src/config.py:1693
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1694
 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:1697
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1698
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1702
+#: ../src/config.py:1710
 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:1708
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1709
+#: ../src/config.py:1717
 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:1713 ../src/config.py:1717
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1718
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:1789
+#: ../src/config.py:1800
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1801
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:1808 ../src/config.py:1816 ../src/config.py:1858
-#: ../src/config.py:3085 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2006 ../src/config.py:3157
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2007 ../src/config.py:3158
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2028
+#: ../src/config.py:2040
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2029
+#: ../src/config.py:2041
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Došlo je do problema u uzimanju Vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2064
+#: ../src/config.py:2076
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2077
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2076
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2084 ../src/dialogs.py:1674 ../src/dialogs.py:1810
-#: ../src/dialogs.py:1990 ../src/disco.py:438 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2085
+#: ../src/config.py:2097
 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:2089
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2090
+#: ../src/config.py:2102
 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:2121
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2122
+#: ../src/config.py:2134
 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:2305
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2343
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2345
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2395 ../src/disco.py:762 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "DžID"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2412
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2437
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2439
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5801,11 +6012,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2441
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2442
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5813,11 +6024,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2444
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2445
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5825,11 +6036,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2448
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5837,7 +6048,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5853,84 +6064,84 @@ 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:2552
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2574 ../src/gajim.py:1411 ../src/roster_window.py:1932
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2575 ../src/roster_window.py:1906
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2576 ../src/roster_window.py:1933
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2585
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2586
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2682
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:2682
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:2683
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:2684
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:2787
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
 
-#: ../src/config.py:3068
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3070
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3096
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Dupliraj Džaber ID"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Ovaj nalog je već konfigurisan u Gajimu."
 
-#: ../src/config.py:3114
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3115 ../src/config.py:3302
+#: ../src/config.py:3119 ../src/config.py:3308
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5940,24 +6151,24 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3133
+#: ../src/config.py:3137
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:3134
+#: ../src/config.py:3138
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3185 ../src/gajim.py:1983
+#: ../src/config.py:3189 ../src/gajim.py:1993
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3186 ../src/gajim.py:1984
+#: ../src/config.py:3190 ../src/gajim.py:1994
 #, 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:3254
+#: ../src/config.py:3258
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -5972,7 +6183,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3260 ../src/gajim.py:2007
+#: ../src/config.py:3264 ../src/gajim.py:2017
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -5983,23 +6194,23 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3281 ../src/config.py:3320
+#: ../src/config.py:3287 ../src/config.py:3326
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3301
+#: ../src/config.py:3307
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3404
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3405
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/conversation_textview.py:547
+#: ../src/conversation_textview.py:549
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6009,7 +6220,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:566
+#: ../src/conversation_textview.py:568
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6017,51 +6228,56 @@ 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:676
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:688
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:712
 #, 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:723
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:732
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "greška prilikom slanja %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Juče"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "Pre %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -6094,155 +6310,143 @@ msgstr "Ime kontakta: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "ID Ključa"
 
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
 
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:731
 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:871 ../src/dialogs.py:877 ../src/dialogs.py:882
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:900
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:898
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:934
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "GTK+ džaber klijent"
 
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:994
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1035
 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:1031
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1191
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Ne mogu da se povežem na port %s."
-
-#: ../src/dialogs.py:1192
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
-
-#: ../src/dialogs.py:1199
+#: ../src/dialogs.py:1210
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6255,88 +6459,88 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1603
+#: ../src/dialogs.py:1614
 #, 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:1606
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:1667 ../src/gajim.py:2589
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1675
+#: ../src/dialogs.py:1686
 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:1694
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:1765
+#: ../src/dialogs.py:1776
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:1766 ../src/groupchat_control.py:1329
-#: ../src/groupchat_control.py:1601
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:1770 ../src/dialogs.py:1776
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1767
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:1783
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:1822
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:1836
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1858
+#: ../src/dialogs.py:1869
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1870
 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:1883
+#: ../src/dialogs.py:1894
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:1941
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1955
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6345,312 +6549,325 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2024
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2025
 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:2054 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: ../src/dialogs.py:2056 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
 #: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
 #: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
 #: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2059 ../src/gajim.py:1576 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1642 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1541 ../src/gajim.py:1609
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1681 ../src/gajim.py:1703
-#: ../src/gajim.py:1720 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1684 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1432 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: ../src/dialogs.py:2070 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2628
 #, 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:2624
+#: ../src/dialogs.py:2633
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:2963
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2966
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2968
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:2978
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "Uslov"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3836
 #, fuzzy, python-format
 msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
 "\n"
-"This session's Short Authentication String is %(sas)s."
+"This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 "Vaša sesija razgovora sa %(jid)s je šifrovana.\n"
 "\n"
 "Kratka Autentikaciona Niska (KAN) ove sesije je: %(sas)s"
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3840
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+#, fuzzy
 msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+"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 ""
 "Da biste bili sigurni da samo očekivane osobe mogu da čitaju Vaše poruke ili "
 "da Vam šalju poruke, morate potvrditi njihov identitet."
 
-#: ../src/dialogs.py:3842
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+#, fuzzy
+msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet udaljenog kontakta?"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:3882
 #, fuzzy, python-format
 msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"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>."
@@ -6660,37 +6877,58 @@ msgstr ""
 "istu kratku Autentikacionu nisku kao vi.\n"
 "Kratka Autentikaciona Niska (KAN) ove sesije: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:3883
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Da li ste razgovarali sa kontaktom i potvrdili KAN?"
 
-#: ../src/disco.py:115
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "Ključ kontakta (%s) ne poklapa se sa ključem pridruženim u Gajimu."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:119
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:439
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:515
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:655
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -6698,72 +6936,77 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:660 ../src/disco.py:942
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:661
+#: ../src/disco.py:662
 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:741
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Neispravan server"
+
+#: ../src/disco.py:754
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:781
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:943
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1164
+#: ../src/disco.py:1179
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1174 ../src/disco.py:1338
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1375
+#: ../src/disco.py:1390
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1557
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1565
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1802
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1867
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1873
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:1879
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
@@ -6803,7 +7046,8 @@ msgid "gajim-remote"
 msgstr "gajim-remote"
 
 #: ../src/features_window.py:60
-msgid "A script to controle Gajim via commandline."
+#, fuzzy
+msgid "A script to control Gajim via commandline."
 msgstr "Skripta za kontrolu Gajima iz komandne linije."
 
 #: ../src/features_window.py:61
@@ -6813,7 +7057,7 @@ msgstr "Zahteva python-dbus."
 #: ../src/features_window.py:62 ../src/features_window.py:66
 #: ../src/features_window.py:70 ../src/features_window.py:74
 #: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
@@ -6955,8 +7199,18 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$."
 
 #: ../src/features_window.py:101
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Zahteva texlive-latex-base, dvips i imagemagick. Morate podesiti'use_latex' "
+"na True u editoru naprednih podešavanja."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Zahteva texlive-latex-base, dvips i imagemagick. Morate podesiti'use_latex' "
@@ -7019,138 +7273,138 @@ msgstr "Vreme"
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
 #: ../src/history_manager.py:499
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke prekinut"
 
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Prenos datoteke je zaustavljen od kontakta sa druge strane"
 
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Odaberite datoteku za slanje..."
 
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 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:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 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:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Snimi datoteku kao..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7158,32 +7412,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/sek)"
 
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Neispravna datoteka"
 
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pauza"
 
@@ -7261,68 +7515,79 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
 #, 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)."
 
 #. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gajim.py:560
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Vaš željeni nadimak je trenutno u upotrebi u grupnom razgovoru %s ili je "
+"registrovan od strane nekog od učesnika.\n"
+"Molimo odredite drugi nadimak ispod:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: ../src/gajim.py:562
+#: ../src/gajim.py:573
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:576
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gajim.py:919 ../src/gajim.py:923
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:933 ../src/gajim.py:946
+#: ../src/gajim.py:944 ../src/gajim.py:957
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:978
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gajim.py:998
+#: ../src/gajim.py:1010
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7330,74 +7595,74 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: ../src/gajim.py:1039
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216
-#: ../src/history_window.py:408 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: ../src/gajim.py:1296
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s has set the subject to %s"
+msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1359 ../src/groupchat_control.py:1026
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1372
 msgid "Room now shows unavailable member"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1364
+#: ../src/gajim.py:1374
 msgid "room now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1377
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
 "korisnika)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1380
 msgid "Room logging is now enabled"
 msgstr "Logovanje u sobi je sada omogućeno"
 
-#: ../src/gajim.py:1372
+#: ../src/gajim.py:1382
 msgid "Room logging is now disabled"
 msgstr "Logovanje u sobi je sada onemogućeno"
 
-#: ../src/gajim.py:1374
+#: ../src/gajim.py:1384
 msgid "Room is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1387
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1390
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: ../src/gajim.py:1412
+#: ../src/gajim.py:1422
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
 
-#: ../src/gajim.py:1446
+#: ../src/gajim.py:1456
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7405,20 +7670,20 @@ msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1461
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1554
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7426,7 +7691,7 @@ msgstr[0] "Imate %d novi e-mejl razgovor"
 msgstr[1] "Imate %d nova e-mejl razgovora"
 msgstr[2] "Imate %d novih e-mejl razgovora"
 
-#: ../src/gajim.py:1568
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
@@ -7441,34 +7706,34 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gajim.py:1704
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1708
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: ../src/gajim.py:1721
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1820
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7477,36 +7742,36 @@ msgstr ""
 "Ne mogu da dešifrujem poruku od kontakta %s\n"
 "Možda je promenjena."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1827
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gajim.py:1888
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:1889
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1911
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1924
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1935
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gajim.py:1950
+#: ../src/gajim.py:1960
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:1961
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7514,11 +7779,11 @@ msgstr ""
 "Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
 "novo ime resursa"
 
-#: ../src/gajim.py:2004
+#: ../src/gajim.py:2014
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2015
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7529,15 +7794,15 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gajim.py:2010
+#: ../src/gajim.py:2020
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gajim.py:2025
+#: ../src/gajim.py:2035
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2036
 #, python-format
 msgid ""
 "It seems the SSL certificate has changed or your connection is being "
@@ -7553,11 +7818,11 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../src/gajim.py:2048 ../src/gajim.py:2078
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2059
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7565,16 +7830,16 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
 "želite to da uradite?"
 
-#: ../src/gajim.py:2051 ../src/gajim.py:2081
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: ../src/gajim.py:2052 ../src/gajim.py:2082 ../src/groupchat_control.py:1707
-#: ../src/roster_window.py:3806
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
 msgid "Do _not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/gajim.py:2079
+#: ../src/gajim.py:2089
 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?"
@@ -7582,27 +7847,27 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2106
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2107
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2547 ../src/gajim.py:2568
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gajim.py:2548
+#: ../src/gajim.py:2573
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
 
-#: ../src/gajim.py:2569
+#: ../src/gajim.py:2594
 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 "
@@ -7612,66 +7877,57 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gajim.py:2595 ../src/roster_window.py:3334
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2876
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: ../src/gajim.py:2973
+#: ../src/gajim.py:2997
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/gajim.py:2974
+#: ../src/gajim.py:2998
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/gajim.py:2987
+#: ../src/gajim.py:3011
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/gajim.py:2988
+#: ../src/gajim.py:3012
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
 "kontakata."
 
-#: ../src/gajim.py:3175
-msgid "Network Manager support not available"
-msgstr "Podrška za upravitelja mreže nije dostupna"
-
-#: ../src/gajim.py:3299
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr ""
-"Podrška za upravljanje sesijama nije dostupna (nedostaje gnome.ui modul)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7679,49 +7935,49 @@ msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "nalog"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Menja status jednog ili više naloga"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "poruka"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -7730,19 +7986,19 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dijalog razgovora kako biste mogli razgovarati sa kontaktom"
 
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "Džaber ID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
 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 "
@@ -7752,29 +8008,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
 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 "
@@ -7784,135 +8040,135 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
 
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "džid"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvara dijalog za započinjanje razgovora"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -7920,67 +8176,67 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Upravlja xmpp:/ uri-jem"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
 msgid "URI to handle"
 msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
 msgid "Account in which you want to handle it"
 msgstr "Nalog u kome želite da upravljate njime"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
 msgid "Room JID"
 msgstr "Džaber ID sobe:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
 msgid "Nickname to use"
 msgstr "Nadimak za korišćenje"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
 msgid "Password to enter the room"
 msgstr "Lozinka za ulazak u sobu"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
 msgid "Account from which you want to enter the room"
 msgstr "Nalog sa koga želite da uđete u sobu"
 
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:279
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:314
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:333
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7989,15 +8245,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:389
+#: ../src/gajim-remote.py:380
 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:418
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8006,16 +8262,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8024,7 +8280,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8033,7 +8289,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:508
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8042,7 +8298,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:527
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Loš uri"
 
@@ -8071,129 +8327,149 @@ 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:145
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
 #, 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:383
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:535
+#: ../src/groupchat_control.py:603
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:537
+#: ../src/groupchat_control.py:605
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1027
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1127
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1129
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1132
 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:1040
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1142
 #, 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:1051
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1153
 #, 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:1064
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
 #, 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:1102
+#: ../src/groupchat_control.py:1201
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1107
+#: ../src/groupchat_control.py:1206
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1211
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s je izbačen: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1214
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8206,7 +8482,7 @@ msgstr ""
 "Džaber ID trenutno u sobi, on/ona će biti izbačen(a). Razmaci u imenima NISU "
 "podržani."
 
-#: ../src/groupchat_control.py:1534
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8214,7 +8490,7 @@ msgid ""
 msgstr ""
 "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
 
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8223,7 +8499,7 @@ msgstr ""
 "Način korišćenja: /%s [razlog], zatvara trenutni prozor ili jezičak, i "
 "prikazuje razlog ako je naznačen."
 
-#: ../src/groupchat_control.py:1546
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8232,7 +8508,7 @@ msgstr ""
 "Način korišćenja: /%s DžID> [razlog], poziva Džaber ID u trenutni grupni "
 "razgovor, opciono dajući razlog."
 
-#: ../src/groupchat_control.py:1550
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8241,7 +8517,7 @@ msgstr ""
 "Način korišćenja: /%s <soba>@<server>[/nadimak], nudi mogućnost spajanja na "
 "soba@server koristeći navedeni nadimak."
 
-#: ../src/groupchat_control.py:1554
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8252,7 +8528,7 @@ msgstr ""
 "nadimkom iz grupnog razgovora i opciono prikazuje razlog. NE podržava blanko "
 "znakove u nadimku."
 
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1692
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8261,65 +8537,65 @@ msgstr ""
 "Način korišćenja: /%s <nadimak> [poruka], otvara prozor privatne poruke i "
 "šalje poruku učesniku sa zadatim nadimkom."
 
-#: ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
 "razgovoru."
 
-#: ../src/groupchat_control.py:1572
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: ../src/groupchat_control.py:1576
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Način korišćenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
 
-#: ../src/groupchat_control.py:1579
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Način korišćenja: /%s <poruka>, šalje poruku ne gledajući ostale komande."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1837
 #, 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:1703
+#: ../src/groupchat_control.py:1839
 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:1740
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1882
 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:1773
+#: ../src/groupchat_control.py:1908
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1909
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8327,22 +8603,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:1911
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1950
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2247
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -8425,7 +8701,7 @@ msgstr "Kontakti"
 
 #. holds time
 #: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
@@ -8436,7 +8712,7 @@ msgstr "Nadimak"
 
 #. holds message
 #: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Poruka"
 
@@ -8489,22 +8765,27 @@ msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
 msgstr[2] ""
 
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istorijat razgovora sa %s"
 
-#: ../src/history_window.py:404
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Greška pri upisu na disk"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:414
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:417
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
@@ -8517,19 +8798,19 @@ msgstr "Isteklo vreme za učitavanje slike"
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:440
+#: ../src/message_window.py:446
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:442
+#: ../src/message_window.py:448
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Poruke"
 
@@ -8541,42 +8822,42 @@ msgstr "- poruke će biti logovane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
-#: ../src/notify.py:231
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
 
-#: ../src/notify.py:261
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova samostalna poruka od kontakta %(nickname)s"
 
-#: ../src/notify.py:269
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privatna poruka sa grupnog razgovora %s"
 
-#: ../src/notify.py:271
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:274
+#: ../src/notify.py:273
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:280
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
@@ -8589,18 +8870,18 @@ msgstr "Opšte"
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2803
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2806
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2808 ../src/roster_window.py:2819
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
@@ -8632,38 +8913,38 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:290 ../src/roster_window.py:955
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1860
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1861
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1881
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1882
 #, 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:1883
+#: ../src/roster_window.py:1894
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1895
 #, 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:1909
+#: ../src/roster_window.py:1920
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8671,15 +8952,15 @@ msgstr ""
 "Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tpravilno startovan"
 "(promenljive okruženja verovatno nisu \t\t\t\t\t\t\tpravilno podešene)"
 
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2095 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2096 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -8687,15 +8968,15 @@ 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:2122
+#: ../src/roster_window.py:2146
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2493
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2285
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8703,16 +8984,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2494
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2498
+#: ../src/roster_window.py:2526
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8720,11 +9001,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2501
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2534
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8734,51 +9015,52 @@ msgstr ""
 "transporta: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2734
 #, 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:2744
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno ukloni i sve kontakte iz ove grupe iz liste kontakata"
 
-#: ../src/roster_window.py:2790
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3128
 #, 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:3146
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -8786,7 +9068,13 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno uklanjate i odobrenje što znači da će Vas "
 "ta osoba uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:3151
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Da li želite da prihvatite ovu pozivnicu?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -8794,16 +9082,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:3154
+#: ../src/roster_window.py:3144
 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:3158
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -8813,21 +9101,21 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3192
 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:3720
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3710
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -8835,13 +9123,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:3800
+#: ../src/roster_window.py:3784
 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:3802
+#: ../src/roster_window.py:3786
 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 "
@@ -8851,14 +9139,14 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:3915
+#: ../src/roster_window.py:3899
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:3926
-#, python-format
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid_plural "Do you want to send these files to %s:"
 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:"
@@ -8868,123 +9156,123 @@ msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4598 ../src/roster_window.py:4669
-#: ../src/roster_window.py:4678 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4674
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4690
+#: ../src/roster_window.py:4679
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4730
+#: ../src/roster_window.py:4716 ../src/systray.py:303
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4749
+#: ../src/roster_window.py:4736
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4776
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:4851 ../src/roster_window.py:4960
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:4878
+#: ../src/roster_window.py:4865
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:4885
+#: ../src/roster_window.py:4873
 msgid "Mood"
 msgstr "Raspoloženje"
 
-#: ../src/roster_window.py:4889
+#: ../src/roster_window.py:4879
 msgid "Activity"
 msgstr "Aktivnost"
 
-#: ../src/roster_window.py:4894
+#: ../src/roster_window.py:4884
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5048
+#: ../src/roster_window.py:5035
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5056 ../src/roster_window.py:5560
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5051
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5068
+#: ../src/roster_window.py:5055
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
-#: ../src/roster_window.py:5462
+#: ../src/roster_window.py:5465
 msgid "I would like to add you to my roster"
 msgstr "Želeo bih Vas dodati na moju listu kontakata"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5580
+#: ../src/roster_window.py:5588
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Send single message
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5649
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5697
+#: ../src/roster_window.py:5705
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5713
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
-#: ../src/roster_window.py:5780
+#: ../src/roster_window.py:5788
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5795
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
-#: ../src/roster_window.py:5867
+#: ../src/roster_window.py:5875
 msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
 #. History manager
-#: ../src/roster_window.py:5980
+#: ../src/roster_window.py:5988
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5989
+#: ../src/roster_window.py:5997 ../src/systray.py:341
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:6199
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
@@ -9001,27 +9289,27 @@ msgstr "Greška u primanju forme za podatke"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:122
+#: ../src/session.py:124
 msgid "Disk WriteError"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/session.py:232
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:392 ../src/session.py:430
+#: ../src/session.py:398 ../src/session.py:433
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:393
-#, python-format
+#: ../src/session.py:400
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t\t%s\n"
+"\t%s\n"
 "\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
 msgstr ""
 "Udaljeni klijent želi da započne sesiju sa ovim mogućnostima:\n"
 "\n"
@@ -9029,7 +9317,7 @@ msgstr ""
 "\n"
 "\t\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:431
+#: ../src/session.py:434
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9044,19 +9332,19 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/systray.py:261
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Džaber ID: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Resurs: "
 
@@ -9073,104 +9361,95 @@ msgstr " [blokiran]"
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslednji status: %s"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Connected"
 msgstr "Na vezi"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Disconnected"
 msgstr "Van veze"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
 msgid "Activity:"
 msgstr "Aktivnost:"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Pesma:"
 
-#: ../src/tooltips.py:641
-#, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
-"iz <i>%(source)s</i>"
-
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Slanje"
 
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Završen"
 
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9178,24 +9457,24 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9203,7 +9482,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9211,13 +9490,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
 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:326
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9225,18 +9504,75 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:334
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s nije emitovao OpenPGP ključ, niti mu je ijedan dodeljen"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Ne postoji komanda: /%s (ako želite da pošaljete to kao poruku, "
+#~ "prefiksirajte je sa /say)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
+#~ "razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E enkripcija omogućena"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E enkripcija onemogućena"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Ako je označeno, Gajim će sortirati avatare kontakata u listi kontakata "
+#~ "po statusu, a ne po prikazanom imenu"
+
+#~ msgid "A_ccounts"
+#~ msgstr "Nalo_zi"
+
+#~ msgid "<b>\"%(title)s\"</b> by "
+#~ msgstr "<b>\"%(title)s\"</b> od "
+
+#~ msgid "%(title)s by %(artist)s\n"
+#~ msgstr "%(title)s od %(artist)s\n"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "Korisničko ime za Last.fm nalog."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Zamišljen"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Podrška za upravitelja mreže nije dostupna"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr ""
+#~ "Podrška za upravljanje sesijama nije dostupna (nedostaje gnome.ui modul)"
+
 #~ msgid "Close"
 #~ msgstr "Zatvori"
 
@@ -9394,9 +9730,6 @@ msgstr " resurs sa prioritetom "
 #~ "\n"
 #~ "Mogućnost bojenja loše napisanih reči neće biti korišćena"
 
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr "%s nije emitovao OpenPGP ključ, niti mu je ijedan dodeljen"
-
 #~ msgid "Every %s _minutes"
 #~ msgstr "Svaka %s _minuta"
 
@@ -9420,11 +9753,6 @@ msgstr " resurs sa prioritetom "
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s ne liči da je validan Džaber ID"
 
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "Ne postoji komanda: /%s (ako želite da pošaljete to kao poruku, "
-#~ "prefiksirajte je sa /say)"
-
 #~ msgid "_Log on"
 #~ msgstr "_Prijava"
 
diff --git a/po/sv.po b/po/sv.po
index 50b32b6da..1bfc2d1e7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,15 +3,11 @@
 # This file is distributed under the same license as the gajim package.

 # Oscar Hellström <oscar@oscarh.net>, 2005.

 # 

-#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:244 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:247
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-23 21:28+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2007-01-20 16:54+0100\n"
 "Last-Translator: Oscar Hellström <oscar@oscarh.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -33,44 +29,52 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM-klient"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Skicka enstaka _meddelande"
+#: ../data/glade/roster_window.glade.h:7
+msgid "Join _Group Chat..."
+msgstr "Anslut till _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
-msgid "_Discover Services..."
-msgstr "_Upptäck tjänster..."
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Discover Services"
+msgstr "_Upptäck tjänster"
 
-#: ../data/glade/account_context_menu.glade.h:4 ../src/disco.py:1147
+#: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Exekvera kommando..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppchatt"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Redigera konto"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modifiera konto..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Öppna Gmail Inbox"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Personlig info"
+
 #: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:24
+#, fuzzy
+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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -83,54 +87,79 @@ msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Välj ett av alternativen nedan:</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
-msgid "<b>Please fill in the data for your new account</b>"
-msgstr "<b>Fyll i informationen för ditt nya konto</b>"
+msgid "<b>Please fill in the data for your existing account</b>"
+msgstr "Fyll i informationen för ditt existerande konto"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klicka för att visa funktioner (som MSN, ICQ transporter) på jabberservrar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "Anslut när jag trycker på Slutför"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoskaparen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+msgid "I already have an account I want to _use"
 msgstr "Jag har redan ett konto jag vill använda"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Om kryssad kommer Gajim komma ihåg lösenordet för det här kontot"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Lösen_ord:"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "Hantera..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Serverns funktioner"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Ställ in min profil när jag ansluter"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Använd anpassat värdnamn/port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -138,67 +167,64 @@ msgstr ""
 "Du behöver ha ett konto för att lyckas ansluta till\n"
 "Jabber-nätverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Ditt JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Slutför"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Värd:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Värdnamn: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "Skriv om _lösenord:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Använd proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig information</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "Konto"
 
@@ -207,20 +233,29 @@ msgid "Account Modification"
 msgstr "Kontomodifiering"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "Administratörslista"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Återanslut när anslutningen förloras"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Anslut vid start av Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "_Byt lösenord"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -231,44 +266,61 @@ msgstr ""
 "förväntades ha SSL-support. Notera att Gajim använder TLS kryptering som "
 "standard om servern stödjer det och med det här valet kommer TLS slås av"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Välj nyc_kel..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "Klicka för att byta kontots lösenord"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "Förbindelse"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Redigera personlig information..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:457
-#: ../src/notify.py:479 ../src/notify.py:491 ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. 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:21
+#: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346 ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436 ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154 ../src/common/contacts.py:280
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "Generellt"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Värdnamn: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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."
@@ -276,7 +328,8 @@ msgstr ""
 "Om kryssad kommer Gajim att sända ut fler IP-adresser än bara ditt IP. Detta "
 "för att öka möjligheten att filöverföringar ska fungera som de ska."
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../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"
@@ -284,7 +337,7 @@ msgstr ""
 "Om kryssad kommer Gajim skicka keep-alive-paket som förhindrar att "
 "anslutningen gör timeout vilket leder till frånkoppling"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -293,7 +346,8 @@ msgstr ""
 "Om kryssad kommer Gajim 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:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -302,7 +356,8 @@ msgstr ""
 "Om kryssad kommer Gajim att vid start automatiskt ansluta till jabber genom "
 "det här kontot"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -312,44 +367,49 @@ msgstr ""
 "Om kryssad kommer varje ändring av global status (hanteras av komborutan i "
 "botten av registerfönstret) att påverka även detta konto"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som den är sparad på servern"
 
-#: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Hantera..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -359,20 +419,23 @@ 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:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet ändras automatiskt beroende på din status."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Resur_s: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -386,92 +449,160 @@ msgstr ""
 "och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
 "(se nedan)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Spara _lösenfras (osäkert)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Skicka keep-alive-paket"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Visa frånkopplade _kontakter"
+
+#: ../data/glade/account_modification_window.glade.h:44
 msgid "Use _SSL (legacy)"
 msgstr "Använd _SSL (föråldrat)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Använd anpassat värdnamn/port"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Använd proxy för filöverföringar"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Ändra efter status"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 #, fuzzy
 msgid "_Name:"
 msgstr "_Namn: "
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Logg</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "Konton"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Om kryssad kommer alla lokala kontakter som använder en Bonjour-kompatibel "
-"chattklient (som iChat, Trillian eller Gaim) visas i registret. Du behöver "
-"inte vara ansluten till en jabberserver för att det ska fungera.Alternativet "
-"är bara tillgängligt om python-avahi är installerat och avahi-daemon körs."
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-post:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktivera"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Förnamn:"
+
+#: ../data/glade/accounts_window.glade.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Om kryssad kommer Gajim komma ihåg lösenordet för det här kontot"
+
+#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 du har två eller fler konton och det här är kryssat kommer Gajim lista "
-"alla kontakter som om du hade ett konto"
+"Om standardporten som används för inkommande meddelanden inte passar din "
+"konfiguration kan du välja en annan här.\n"
+"Du kan vilja ändra möjliga brandväggsregler."
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Efternamn:"
+
+#: ../data/glade/accounts_window.glade.h:35
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "Sa_mmanfoga konton"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "Använd _link-local-meddelanden"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "Döp om"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Modifiera"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "Ta _bort"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Använd anpassad port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
@@ -569,6 +700,7 @@ msgid "This jabber entity does not expose any commands."
 msgstr "Den här jabber-entiteten visar inga kommandon."
 
 #: ../data/glade/advanced_configuration_window.glade.h:1
+#: ../data/glade/features_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivning</b>"
 
@@ -595,47 +727,47 @@ msgid "Deletes Message of the Day"
 msgstr "Raderar dagens meddelande"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Personliga integritetslistor"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Skickar ett meddelande till klienter för närvarande anslutna till den här "
 "servern"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
 msgstr "Sätt MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Sätter dagens meddelande"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Visa _XML-konsoll"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "Uppdatera MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Uppdaterar dagens meddelande"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administratör"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Personliga integritetslistor"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "_Skicka servermeddelande"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Skicka enstaka meddelande"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " ett fönster/tabb öppnad med den kontakten "
@@ -649,7 +781,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Villkor</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>Ljud</b>"
 
@@ -666,7 +798,7 @@ msgid "All statuses"
 msgstr "Alla statusar"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "Frånvarande"
 
@@ -683,7 +815,7 @@ msgid "Have "
 msgstr "Har "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -692,7 +824,7 @@ msgid "Launch a command"
 msgstr "Kör ett kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
@@ -820,6 +952,34 @@ msgstr "Nytt objekt mottaget"
 msgid "You have received new entry:"
 msgstr "Du har mottagit ett nytt objekt:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "Kontakter"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>Sparade statusmeddelanden</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
+msgstr ""
+
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
+msgstr ""
+
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Logg</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>Logg</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Byt lösenord"
@@ -849,10 +1009,9 @@ msgid "Join _Group Chat"
 msgstr "Anslut till _gruppchatt"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "_Lägg till registret"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -872,39 +1031,70 @@ msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klicka för att visa tidigare konversationer med den här kontakten"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontakter"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Skicka _fil"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Slå på/av Open_PGP-kryptering"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Slå på/av Open_PGP-kryptering"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kompakt vy    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Lägg till registret"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "_Historik"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "In_bjud till"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observerande"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fyll i formuläret."
@@ -917,6 +1107,24 @@ msgstr "Rumkonfiguration"
 msgid "Edit Groups"
 msgstr "Redigera grupper"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Beskrivning</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Serverns funktioner"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En lista på aktiva, kompletta och stoppade filöverföringar"
@@ -972,7 +1180,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "När en filöverföring är färdig, visa en popupnotifiering"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -980,7 +1188,7 @@ msgstr "_Fortsätt"
 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:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 #, fuzzy
 msgid "_Open Containing Folder"
 msgstr "_Öppna behållande mapp"
@@ -1029,7 +1237,7 @@ msgstr "Gajim temaanpassare"
 msgid "Gone"
 msgstr "Frånvarande"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inaktiv"
 
@@ -1070,58 +1278,72 @@ msgid "_Background:"
 msgstr "_Bakgrund:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "Byt smek_namn"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "Byt _ämne"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "Klicka för att visa tidigare konversationer i det här rummet"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Konfigurera _rum"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Konfigurera _rum"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Bokmärk det här rummet"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "_Bokmärk det här rummet"
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Hantera bokmärken"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Operatörsåtgärder"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Sparka ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Operatörsåtgärder"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Ägare"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Röst"
 
@@ -1129,22 +1351,19 @@ msgstr "_Röst"
 msgid "Create new post"
 msgstr "Skapa ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "Från"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "Ämne"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1156,56 +1375,58 @@ 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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajims historikhanterare"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Radera"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Exportera"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajims historikhanterare"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Sök i databasen"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Bygg egen fråga"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "Konversationshistorik"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Frågebyggare..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "Sök"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "_Sök"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "Acceptera"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "Neka"
+#, fuzzy
+msgid "Search:"
+msgstr "Sök"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "Inbjudan mottagen"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Logga konversationshistorik"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1149
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
@@ -1214,14 +1435,12 @@ msgid "Join this room automatically when I connect"
 msgstr "Gå in i rummet automatiskt när jag ansluter"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -1230,12 +1449,12 @@ msgid "Recently:"
 msgstr "Nyligen:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1165
-#: ../src/disco.py:1548
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "_Gå in i"
 
@@ -1255,18 +1474,37 @@ msgstr "Om kryssad kommer Gajim gå in i den här gruppchatten vid start"
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Skriv ut status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titel:"
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "Rumkonfiguration"
+
+#: ../data/glade/manage_pep_services_window.glade.h:2
+#, fuzzy
+msgid "_Configure"
+msgstr "_Fortsätt"
+
+#: ../data/glade/manage_pep_services_window.glade.h:3
+#, fuzzy
+msgid "gtk-delete"
+msgstr "Radera"
+
 #: ../data/glade/manage_proxies_window.glade.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
@@ -1276,46 +1514,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>Inställningar</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "HTTP-anslut"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "Namn:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Lösen_ord:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Värd:"
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Klicka för att sätta in en känsloikon (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Lägger till en kontakt till registret"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP-kryptering"
+#: ../data/glade/message_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Bokmärk det här rummet"
+
+#: ../data/glade/message_window.glade.h:3
+msgid "Browse the chat history (Ctrl+H)"
+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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "_Åtgärder"
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:5
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Byt smek_namn"
 
-#. 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:6
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "uppmärksammar konversationen"
+
+#: ../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 "Klicka för att sätta in en känsloikon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:9
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -1331,36 +1608,77 @@ msgstr "<b>Avancerad konfigurationsredigerare</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Program</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Åtgärder</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>Anpassa</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Format av en rad</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>Format av en rad</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Tabbfärger för chattstatus</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail-inställningar</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Visuella meddelanden</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Gränssnittsanpassning</b>"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Custom</b>"
+msgstr "<b>Anpassa</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>Logg</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail-inställningar</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Sparade statusmeddelanden</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Privata integritetslistor</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Sparade statusmeddelanden</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Egenskaper</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuella meddelanden</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avancerad"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1370,52 +1688,27 @@ msgstr ""
 "Författande enbart\n"
 "Frånslagen"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "Tillåt _OS-information att skickas"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Tillåt popups/notifieringar när jag är _frånvarande/inte tillgänglig/"
 "upptagen/osynlig"
 
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Också känt som iChat-stil"
-
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Always check to see if Gajim is the _default Jabber client on startup"
-msgstr "Kolla alltid vid start om Gajim är _standardklient för Jabber"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"Ett exempel: Om du har aktiverat statusmeddelanden för frånvarande kommer "
-"Gajim inte fråga dig efter ett statusmeddelande när du byter status till "
-"frånvarande.Det kommer använda ditt förinställda satt här"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "Automatiskt _frånvarande efter:"
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "Automatiskt _ej tillgänglig efter:"
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Detektera vid varje Gajimstart\n"
@@ -1424,69 +1717,57 @@ msgstr ""
 "Använd alltid XFCE4s standardprogram\n"
 "Anpassa"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Chatt"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Statusmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, because it blocks all messages from any contact that "
-"is not in the roster"
-msgstr ""
-"Kryssa i det här valet enbart om någon du inte har i registret spammar/"
-"irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
-"alla kontakter som inte finns i ditt register"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Kolla alltid vid start om Gajim är _standardklient för Jabber"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "Konfigurera färger och teckensnitt för gränssnittet"
 
-#: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Förinställda statusmeddelanden"
-
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Standarduppsättning av status_ikoner:"
-
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid ""
-"Determined by sender\n"
-"Chat message\n"
-"Single message"
+"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 ""
 
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display _extra email details"
-msgstr "Visa _extra e-postdetaljer"
-
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Display a_vatars of contacts in roster"
-msgstr "Visa a_vatarer för kontakter i registret"
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "Display status _messages of contacts in roster"
-msgstr "Visa status_meddelanden för kontakter i registret"
-
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Visa chattstatusnoti_fieringar:"
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "Visa a_vatarer för kontakter i registret"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "_Var 5:e minut"
+msgid "Display _extra email details"
+msgstr "Visa _extra e-postdetaljer"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Känsloikoner:"
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "Visa a_vatarer för kontakter i registret"
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Händelser"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Visa a_vatarer för kontakter i registret"
 
 #: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "Visa a_vatarer för kontakter i registret"
+
+#: ../data/glade/preferences_window.glade.h:45
+msgid "Display status _messages of contacts in roster"
+msgstr "Visa status_meddelanden för kontakter i registret"
+
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1496,7 +1777,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du specificera vilka chattstatusar du "
 "vill visa i chattfönster."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1506,42 +1787,25 @@ msgstr ""
 "som du har med en kontakt: Här kan du specificera vilka chattstatusar du "
 "vill skicka till den andra parten."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relative window"
-msgstr ""
-"Gajim kommer automatiskt visa nya inkommande händelser genom att öppna "
-"relevant fönster"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim kommer att meddela dig om nya händelser via en popup i höger nederkant "
-"av skärmen"
-
 #: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim kommer meddela dig via ett popup-fönster i det nedre högra hörnet av "
-"skärmen om kontakter som just loggat in"
-
-#: ../data/glade/preferences_window.glade.h:49
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 "Gajim kommer meddela dig via ett popup-fönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
 #: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Gömmer knapparna i gruppchattfönstret"
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr ""
-"Gajim kommer endast byta ikonen för kontakten som skickade den nya händelsen"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Om kryssad kommer Gajim gå in i den här gruppchatten vid start"
 
 #: ../data/glade/preferences_window.glade.h:52
 msgid ""
@@ -1552,6 +1816,18 @@ msgstr ""
 "nya e-posten"
 
 #: ../data/glade/preferences_window.glade.h:53
+#, 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:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1559,7 +1835,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1567,106 +1843,150 @@ msgstr ""
 "Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i register- och gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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"
+"If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
-"Om kryssad kommer Gajim komma ihåg registrets och chattfönstrens positioner "
-"och storlekar på skärmen nästa gång de används"
+"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+"gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
-"Om kryssad kommer Gajim använda protokoll-specifika statusikoner (t.ex. en "
-"kontakt från MSN kommer ha msnikonen för status tillgänlig, frånvarande, "
-"upptagen, osv...)"
+"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+"gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
-"Om inte avstängd kommer Gajim ersätta ascii-smilies som \":)\" med "
-"motsvarande animerade eller statiska grafiska känsloikoner"
+"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+"gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:58
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignorera textformatering i inkommande meddelanden"
+#: ../data/glade/preferences_window.glade.h:60
+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:59
-msgid "Ma_nage..."
-msgstr "Ha_ntera..."
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Kryssa i det här valet enbart om någon du inte har i registret spammar/"
+"irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
+"alla kontakter som inte finns i ditt register"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"Aldrig\n"
-"Alltid\n"
-"Per konto\n"
-"Per typ"
+
+#: ../data/glade/preferences_window.glade.h:63
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Om kryssad kommer Gajim också inkludera information om vem som skickade den "
+"nya e-posten"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Notifiera mig om kontakter som: "
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Om kryssad kommer Gajim använda protokoll-specifika statusikoner (t.ex. en "
+"kontakt från MSN kommer ha msnikonen för status tillgänlig, frånvarande, "
+"upptagen, osv...)"
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "Notify on new _GMail email"
-msgstr "Notifiera om ny e-post på _Gmail"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "Vid varje _meddelande"
+#, fuzzy
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Om inte avstängd kommer Gajim ersätta ascii-smilies som \":)\" med "
+"motsvarande animerade eller statiska grafiska känsloikoner"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Ett meddelandefönster:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Utgående chattstatusnoti_fieringar:"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Ett meddelandefönster:"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Play _sounds"
-msgstr "_Spela ljud"
+msgid "Ma_nage..."
+msgstr "Ha_ntera..."
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Preferences"
-msgstr "Inställningar"
+#, fuzzy
+msgid "Notifications"
+msgstr "Kontomodifiering"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Skriv ut tid:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notifiera mig om kontakter som: "
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Spara _position och storlek för register- och chattfönster"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notifiera mig om kontakter som: "
 
 #: ../data/glade/preferences_window.glade.h:73
-msgid "Set status message to reflect currently playing _music track"
-msgstr "Sätt statusmeddelandet till nu spelandes _musikspår"
+msgid "Notify on new _GMail email"
+msgstr "Notifiera om ny e-post på _Gmail"
 
 #: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Visa enbart i _registret"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Personlig info"
 
 #: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "_Spela ljud"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1674,141 +1994,150 @@ msgstr ""
 "Vissa meddelanden kan innehålla textformatering (storlekar, färger etc). Om "
 "kryssad kommer Gajim bara att visa rå text."
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sortera kontakter efter status"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:85
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Standarduppsättning av status_ikoner:"
+
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "Avstannad"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid "The auto away status message"
-msgstr "Det automatiska statusmeddelandet när du är frånvarande"
-
-#: ../data/glade/preferences_window.glade.h:81
-msgid "The auto not available status message"
-msgstr "Det automatiska statusmeddelandet när du inte är tillgänglig"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Treat all incoming messages as:"
-msgstr "Behandla alla inkommande meddelanden som:"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr ""
 "Använd _transporternas\n"
 "ikonuppsättningar"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "Använd systemets _standard"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
-
-#: ../data/glade/preferences_window.glade.h:86
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"När en ny händelse (meddelande, filöverföringförfrågan etc...) mottas kan "
-"följande metoder användas för att informera dig om det. Observera att "
-"händelser rörande nya meddelanden endast används om det är ett nytt "
-"meddelande från en kontakt du inte redan chattar med"
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "When new event is received:"
 msgstr "När en ny händelse tas emot"
 
-#: ../data/glade/preferences_window.glade.h:88
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"Fungerar för Rhythmbox och Muine. För fler spelare, se http://trac.gajim.org/"
-"wiki/GajimAndMusicPlayer"
-
-#: ../data/glade/preferences_window.glade.h:89
-msgid "_Advanced Notifications Control..."
-msgstr "_Avancerad notifieringskontroll..."
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "Automatiskt _frånvarande efter:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:95
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Visa chattstatusnoti_fieringar:"
+
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Känsloikoner:"
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "_Filhanterare:"
 
-#: ../data/glade/preferences_window.glade.h:92
-msgid "_Font:"
-msgstr "_Teckensnitt:"
-
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i registret"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorera textformatering i inkommande meddelanden"
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "_Inkommande meddelande:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar hos kontakter"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Aldrig"
-
-#: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Notifiera mig om det"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Automatiskt _ej tillgänglig efter:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "_Utgående meddelande:"
 
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Player:"
-msgstr "_Spelare:"
-
-#: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Öppna det"
-
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "Återställ till standardfärger"
 
-#: ../data/glade/preferences_window.glade.h:105
-msgid "_Sort contacts by status"
-msgstr "_Sortera kontakter efter status"
+#: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Visa chattstatusnoti_fieringar:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "_Statusmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:107
-msgid "_URL:"
-msgstr "_URL:"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Anslut till _gruppchatt"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Inte i registret"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "minuter"
 
@@ -1844,6 +2173,10 @@ msgstr "Alla"
 msgid "Allow"
 msgstr "Tillåt"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Neka"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 #, fuzzy
 msgid "JabberID"
@@ -1853,7 +2186,7 @@ msgstr "Jabber-ID:"
 msgid "Order:"
 msgstr "Ordning:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1863
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "Privat integritetslista"
 
@@ -1894,145 +2227,177 @@ msgstr "att skicka mig status"
 msgid "to view my status"
 msgstr "att visa min status"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Format av en rad</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "Om"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "Ställ in _avatar"
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "Adress"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "Födelsedag:"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "Ställ in _avatar"
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>Anpassa</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "Födelsedag:"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Anpassa</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "Ort:"
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>Ljud</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-msgid "Click to set your avatar"
-msgstr "Klicka för att visa din avatar"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Avdelning:"
 
 #: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "Företag:"
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "E-post:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Land:"
-
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
-msgstr "Avdelning:"
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Extra adress:"
 
+#. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-post:"
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
+msgstr "Efternamn:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
-msgstr "Extra adress:"
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>Anpassa</b>"
 
-#. Family Name
+#. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
-msgstr "Efternamn:"
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
+msgstr "Hemsida:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: ÅÅÅÅ-MM-DD"
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>Format av en rad</b>"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "Förnamn:"
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>Anpassa</b>"
 
 #: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "Smeknamn:"
+
+#: ../data/glade/profile_window.glade.h:20
 #: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
-msgstr "Hemsida:"
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "Telefonnr.:"
 
-#. Middle Name
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "Mellannamn:"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Villkor</b>"
 
 #: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "Postnummer:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:24
 #: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Mer"
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>Egenskaper</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "Personlig info"
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Logg</b>"
+
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>Inställningar</b>"
 
 #: ../data/glade/profile_window.glade.h:27
 #: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "Telefonnr.:"
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "Position:"
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Inställningar</b>"
 
+#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "Postnummer:"
+#: ../data/glade/vcard_information_window.glade.h:36
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Ljud</b>"
 
-#. Prefix in Name
+#. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "Prefix:"
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "Om"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "Roll:"
-
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "Delstat:"
+msgid "Click to set your avatar"
+msgstr "Klicka för att visa 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:41
-msgid "Street:"
-msgstr "Gatuadress:"
-
-#. Suffix in Name
-#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "Suffix:"
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: ÅÅÅÅ-MM-DD"
+
+#: ../data/glade/profile_window.glade.h:35
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "Personlig info"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "Jobb"
 
@@ -2048,78 +2413,128 @@ msgstr "Ta bort konto _enbart från Gajim"
 msgid "Remove account from Gajim and from _server"
 msgstr "Ta bort konto från Gajim och från _servern"
 
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "Ta _bort"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "_Be om att få se hans/hennes status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "Lägg till speciell _notifiering"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "Tilldela Open_PGP-nyckel"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "Redigera _grupper"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "Exekvera kommando..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "In_bjud till"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Skicka enstaka _meddelande"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "Ta _bort"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Skickar anpassad XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "Skicka enstaka _meddelande"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "Skicka _fil"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Starta _chatt"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "_Tillåt henne/honom att se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Förbjud henne/honom att se min status"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028 ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "Ta bo_rt från register"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Kontakter"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "Byt _namn"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Fortsätt"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "_Konton"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Lägg till kontakt..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Lägg till _kontakt"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Serverns funktioner"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2133,51 +2548,91 @@ msgstr "Vanliga frågor (webb)"
 msgid "Help online"
 msgstr "Hjälp online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "Visa _transporter"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "Visa frånkopplade _kontakter"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "Visa _registret"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "_Innehåll"
+#, fuzzy
+msgid "_Accounts"
+msgstr "Konton"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Upptäck tjänster"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Åtgärder"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1286
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "_Innehåll"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Skicka enstaka _meddelande"
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "_Visa"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Vänta medans kommandolistan tas emot..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Sök"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "Lägg till _kontakt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "Kontaktinformation"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "_Sök"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "K_ör"
@@ -2186,10 +2641,6 @@ msgstr "K_ör"
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registrera till"
@@ -2267,10 +2718,31 @@ msgstr "Prenumerationsförfrågan"
 msgid "_Deny"
 msgstr "_Neka"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID för kontakten som du vill chatta med"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
 msgstr "Tysta ljud"
 
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Skicka enstaka _meddelande"
+
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Visa alla väntande _händelser"
@@ -2283,57 +2755,73 @@ msgstr "Visa _registret"
 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:5
-msgid "Ask:"
-msgstr "Fråga:"
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Åtgärder</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "Klient:"
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>Anpassa</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber-ID:"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "Resurs:"
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Inställningar</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Beskrivning</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>Anpassa</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Konfigurera _rum"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "Kontaktinformation"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "OS:"
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "Resurs:"
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "Status:"
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "Prenumeration:"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Logga konversationshistorik"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "Välj avatar"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2343,11 +2831,6 @@ msgstr "<b>Jabbertrafik</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML-inskrivning</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktivera"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2366,15 +2849,29 @@ msgstr "_Meddelande"
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Förnamn:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Lägg till speciell _notifiering"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Efternamn:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Tilldela Open_PGP-nyckel"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "Redigera _grupper"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "Byt _namn"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Modifiera konto..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2384,245 +2881,409 @@ msgstr "Lokal JID:"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Om standardporten som används för inkommande meddelanden inte passar din "
-"konfiguration kan du välja en annan här.\n"
-"Du kan vilja ändra möjliga brandväggsregler."
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Resurs:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Redigera konto"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Använd anpassad port:"
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "Kontaktinformation"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Activated"
 msgstr "Aktiverad"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:97
 msgid "Deactivated"
 msgstr "Inaktiverad"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:99
 msgid "Boolean"
 msgstr "Boolesk"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:100
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:101
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:102
 msgid "Color"
 msgstr "Färg"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "Inställningens namn"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "Värde"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:137
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(Ingen)"
 
-#. we talk about password
-#: ../src/advanced.py:240
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "Dold"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "engelska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Belarusian"
 msgstr "vitryska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "bulgariska"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "bretonska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "tjeckiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "tyska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "grekiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "British"
 msgstr "brittiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "spanska"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "baskiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "franska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "kroatiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "italienska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian (b)"
 msgstr "norska (bokmål)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "nederländska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Norwegian"
 msgstr "norska (nynorsk)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "polska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "portugisiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "brasiliansk portugisiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "ryska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "tyska"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "slovakiska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "svenska"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
 
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Om det inte är språket för vilket du vill markera felstavade ord, sätt din "
-"$LANG variabel rätt. T.ex. för svenska gör export LANG=sv_SE eller export "
-"LANG=sv_SE.UTF-8 i ~/.bash_profile eller för att göra det globalt i /etc/"
-"profile.\n"
-"\n"
-"Funktionen \"markera felstavade ord\" kommer inte att användas"
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "Stavningsspråk"
 
 #. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
 
-#: ../src/chat_control.py:852
-msgid "Chats"
-msgstr "Chattar"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "Kryptering aktiverad"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "Inte i registret"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
 
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" av %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatt %(room_name)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1123
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "Kryptering deaktiverad"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "Använd autentisering"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+msgid "and NOT authenticated"
+msgstr "Använd autentisering"
+
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
 msgstr ""
-"%s har inte sänt ut en OpenPGP-nyckel och du har inte heller tilldelat en"
 
-#: ../src/chat_control.py:1259
-msgid "Encryption enabled"
-msgstr "Kryptering aktiverad"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "Kommandon: %s"
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Användning: /%s, tömmer fönstret från text."
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Användning: /%s, gömmer knapparna."
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
+"person. (t.ex. /%s exploderar.)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Användning: /%s, ställer om ett gruppchatfönster till kompaktvy."
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Användning: /%s, gömmer knapparna."
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "Ingen hjälp för /%s"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[Det här meddelandet är krypterat]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
 
-#: ../src/chat_control.py:1264
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "Kryptering deaktiverad"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1406 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:785 ../src/gajim.py:786
-#: ../src/gajim.py:1130 ../src/roster_window.py:332
-#: ../src/roster_window.py:410 ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508 ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890 ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900 ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:43
-#: ../src/common/helpers.py:255
-msgid "Not in Roster"
-msgstr "Inte i registret"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Det här meddelandet är krypterat]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[Det här meddelandet är krypterat]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du mottog just ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2630,29 +3291,2616 @@ msgstr ""
 "Om du stänger den här fliken och har historik avslagen kommer meddelandet "
 "att förloras."
 
-#: ../src/config.py:137 ../src/config.py:586
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s är nu %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "skapar logdatabas"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s är en fil, men borde vara en katalog"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim kommer nu avslutas"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s är en katalog, men borde vara en fil"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "skapar katalogen %s"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "Kontaktinformation"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "Kontakt Loggade Ut"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "Ledig för chatt"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "_Fortsätt"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr "Inte tillgänglig"
+
+#: ../src/common/commands.py:104
+msgid "Do not disturb"
+msgstr "Stör inte"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr "Frånkopplad - Koppla från"
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "Beskrivning"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr "Statusen har ändrats."
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Gruppchatt"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "I gruppen"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr "Välj de gruppchattar du vill lämna"
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "Gruppchatt"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Du är redan i rummet %s"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "Gajim - ett oläst meddelande"
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+#, fuzzy
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Använd DBus och Notification-Daemon för att visa meddelanden"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tid i minuter tills din status ändras till borta."
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "Borta på grund av inaktivitet"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tid i minuter tills din status ändras till inte tillgänglig."
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "Inte tillgänglig på grund av inaktivitet"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "Standard"
+
+#: ../src/common/config.py:116
+#, fuzzy
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Aktivera link-local-/zeroconf-meddelanden"
+
+#: ../src/common/config.py:119
+#, fuzzy
+msgid "Language used by speller"
+msgstr "Språk använt av stavaren"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"\"alltid\" - skriv ut tid för varje meddelande.\n"
+"\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
+"\"aldrig\" - skriv aldrig ut tid."
+
+#: ../src/common/config.py:121
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Behandla par av * / _ som möliga formateringstecken."
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Om True tas inte */_ bort. *abc* blir fetstil men * * / / _ _ inte borttagna."
+
+#: ../src/common/config.py:128
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tecken att lägga till efter smeknamnet när du använder "
+"smeknamnskomplettering (tabb) i gruppchatt."
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Teckens som föreslås läggas till efter ditt valda smeknamn om smeknamnet "
+"används av någon annan i gruppchatten."
+
+#: ../src/common/config.py:161
+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 ""
+"Det här valet låter dig anpassa tidsstämplar som skrivs ut i konversationer. "
+"T.ex. \"[%H:%M] \" kommer visa \"[timme:minut] \". Läs python-manualen om "
+"strftime för full dokumentation: http://docs.python.org/lib/module-time.html"
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "Lägg till * och [n] i registerfönstrets titel."
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Hur många rader som skall kommas ihåg från tidigare konversation när en "
+"chatt-flik/fönster öppnas igen."
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Mur många minuter skall de sista raderna från tidigare konversation sparas."
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Skicka meddelande med Ctrl+Enter och gör radbryt med Enter (Mirabilis ICQ "
+"Klientens standardbeteende)."
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Skriv in url med %s i där %s är ordet/frasen eller 'WIKTIONARY' vilket "
+"betyder att wiktionary skall användas."
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Om ibockad kan Gajim bli fjärrstyrd med gajim-remote."
+
+#: ../src/common/config.py:180
+#, fuzzy
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Om True, lyssna efter D-Bussignaler från NetworkManager och ändra statusen "
+"för konton (om de nu inte har listen_to_network_manager satt till False och "
+"dem synkar med global status) baserat på om nätverkets status."
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "Fråga innan gruppchattflik eller -fönster stängs."
+
+#: ../src/common/config.py:186
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
+"rum (jid) stängs."
+
+#: ../src/common/config.py:187
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
+"rum (jid) stängs."
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
+"port forwarding."
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standarden säger att KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:194
+#, fuzzy
+msgid "Notify of events in the system trayicon."
+msgstr "Notifiera om händelser in systemets statusikon."
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "Visa flik när endast en konversation är aktiv?"
+
+#: ../src/common/config.py:201
+#, fuzzy
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Visa flikkant om endast en konversation är aktiv?"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "Visa stängknapp i flik?"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Chattstatusmeddelanden:"
+
+#: ../src/common/config.py:218
+#, fuzzy
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
+
+#: ../src/common/config.py:219
+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 ""
+"Om True avslutar Gajim när fönsterhanterarens X-knapp trycks på. Denna "
+"inställning behandlas bara när aktivitetsfältet används."
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Om True kommer Gajim att visa en ikon på varje flik som innehåller olästa "
+"meddelanden. Beroende på tema kan denna ikon vara animerad."
+
+#: ../src/common/config.py:222
+#, fuzzy
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+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 ""
+"Om True kommer Gajim att fråga alla kontakter som antingen inte hade en "
+"avatar, eller som har en för gammal cachad avatar om deras nuvarande avatar."
+
+#: ../src/common/config.py:229
+#, fuzzy
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"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:230
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+
+#: ../src/common/config.py:232
+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:233
+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:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "Visa inte avatar för transporten själv."
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "Visa inte registret i systemets fönsterlista."
+
+#: ../src/common/config.py:238
+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 ""
+"Om True och GTK+ och PyGTK är av version 2.8 eller högre kommer fönstret att "
+"blinka (standardbeteende i de flesta fönsterhanterare) när det finns "
+"väntande händelser."
+
+#: ../src/common/config.py:240
+#, fuzzy
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 tycker inte om SHA-info när man ansluter till ett "
+"lösenordsskyddat rum. Sätt denna inställning till False för att inte skicka "
+"SHA-info i gruppchattnärvaroinformation"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"Kontrollerar fönstret där nya meddelanden placeras.\n"
+"'always' - Alla meddelanden öppnas i ett gemensamt fönster.\n"
+"'never' - Alla meddelanden öppnas i sitt eget fönster.\n"
+"'peracct' - Meddelanden från varje konto skickas till specifikt fönster.\n"
+"'pertype' - Varje meddelandetyp (t.ex. enstaka meddelande eller gruppchatt) "
+"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:244
+#, 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:245
+#, 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:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Gömmer knapparna i gruppchattfönstret"
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "Gömmer bannern i gruppchatfönstret"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "Gömmer bannern i tvåpersoners chattfönster"
+
+#: ../src/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Gömmer deltagarelistan i gruppchatfönstret"
+
+#: ../src/common/config.py:250
+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 ""
+"I en chatt, visa bara smeknamnet vid början av en rad om det inte är samma "
+"person som pratar som i förra meddelandet."
+
+#: ../src/common/config.py:251
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Skicka meddelande och stäng fönster"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl+Tab går till nästa författningsflik när ingen är oläst."
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:256
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 workaround"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"If ibockad kommer Gajim kommer gajim att använda ditt IP och proxies "
+"definerade i file_transfer_proxies under inställningar för filöverföringar."
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+#, fuzzy
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "OpenPGP är inte användbart på den här datorn"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "Språk för vilket vi vill titta efter felstavade ord"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "alla eller mellanslagsseparerad status"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "\"yes\", \"no\" eller \"båda\""
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "\"yes\", \"no\" eller \"\""
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "Sover"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "Snart tillbaka"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "Tillbaka om några minuter."
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "Äter"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "Jag äter, så lämna ett meddelande."
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "Jag tittar på film."
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "Arbetar"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "Jag arbetar."
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "Jag pratar i telefon."
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "Ute"
+
+#: ../src/common/config.py:421
+#, fuzzy
+msgid "I'm out enjoying life."
+msgstr "Jag är ute och njuter av livet."
+
+#: ../src/common/config.py:425
+#, fuzzy
+msgid "I'm available."
+msgstr "Tillgänglig"
+
+#: ../src/common/config.py:426
+#, fuzzy
+msgid "I'm free for chat."
+msgstr "Ledig för chatt"
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "Strax tillbaka."
+
+#: ../src/common/config.py:428
+#, fuzzy
+msgid "I'm not available."
+msgstr "Tjänst är inte tillgänglig"
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "Stör inte."
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "Hejdå!"
+
+#: ../src/common/config.py:441
+#, fuzzy
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"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:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "Ljud att spela när ett MUC-meddelande inkommer."
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "grön"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "grönsaker"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "mänsklig"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "marin"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "Lyckades inte ladda tomgångsmodul"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy
+msgid "Wrong host"
+msgstr "Fel Lösenfras"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registreringsinformation för transport %s har inte kommit fram i tid"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Utökning stöds inte"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Smeknamnet kunde inte hittas: %s"
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Lyckades inte gå med i rummet"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du är bannlyst från detta rummet."
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Det finns inget sådant rum."
+
+#: ../src/common/connection_handlers.py:2060
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Möjligheten att skapa rum är begränsad."
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Ditt registrerade smeknamn måste användas."
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du är inte med i medlemslistan."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Auktorisering har tagits bort"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "Jag skulle vilja lägga till dig i mitt register."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi prenumererar nu på %s"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "avprenumerationsförfrågan från %s"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "vi prenumererar inte längre på %s"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s följer inte RFC. Dt kommer inte att läggas till till ditt register. "
+"Använd registerhanteringsverktyg så som http://jru.jabberstudio.org/  för "
+"att ta bort det"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "Lösenordsfras för OpenPGP angavs inte"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du kommer ansluta till %s utan OpenPGP."
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Lyckades inte ladda tomgångsmodul"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Anslutningen med konto \"%s\" har brutits"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "Återanslut manuellt."
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Okänd D-Busversion: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "Ogiltigt lösenord"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Förbindelse"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunde inte ansluta till \"%s\""
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "Kontrollera din förbindelse eller försök igen senare."
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Kunde inte ansluta till \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Anslutningen med konto \"%s\" har brutits"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "Okänd D-Busversion: %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "Kontrollera din förbindelse eller försök igen"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Inloggning misslyckades med \"%s\""
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "Kontrollera ditt inloggningsnamn och lösenord."
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "problem vid sändning %s ( %s )"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[Det här meddelandet är krypterat]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Ämne: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "Inte hämtad på grund av osynlig status"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "Observerande"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "Transporter"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "Inte i registret"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+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:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajims D-Bus-egenskaper kan inte användas"
+
+#: ../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/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "Kontonamnet kan inte vara tomt."
+
+#: ../src/common/exceptions.py:55
+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
+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
+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"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "one"
+msgstr "Ingen"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "two"
+msgstr "vem"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "three"
+msgstr "Gatuadress:"
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "four"
+msgstr "Port: "
+
+#: ../src/common/fuzzyclock.py:42
+#, fuzzy
+msgid "five"
+msgstr "fil"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "sex"
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "seven"
+msgstr "Händelse"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "åtta"
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "nine"
+msgstr "_Fortsätt"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "tio"
+
+#: ../src/common/fuzzyclock.py:43
+#, fuzzy
+msgid "eleven"
+msgstr "Radera"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "tolv"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "fem över $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "kvart över $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "tio i halv $1"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "fem i halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "Registrera till %s"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Natt"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Tidig morgon"
+
+#: ../src/common/fuzzyclock.py:64
+#, fuzzy
+msgid "Morning"
+msgstr "Arbetar"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Noon"
+msgstr "Ingen"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Eftermiddag"
+
+#: ../src/common/fuzzyclock.py:65
+#, fuzzy
+msgid "Evening"
+msgstr "Händelse"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Sen kväll"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Början av veckan"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Mitt i veckan"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Slutet av veckan"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Helg!"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "Ogiltigt tecken i användarnamn"
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "Serveradress krävs."
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "Ogiltigt tecken i värdnamn."
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "Ogiltigt tecken i resurs."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "_Upptagen"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "Upptagen"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "_Inte tillgänglig"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "_Ledig för chatt"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "Ledig för chatt"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "_Tillgänglig"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "Tillgänglig"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "Upprättar förbindelse"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "_Borta"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "_Frånkopplad"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "Frånkopplad"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "_Osynlig"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?kontakt har status:Okänd"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?kontakt har status:Har fel"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Prenumeration vi redan har:Ingen"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "Till"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "Båda"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Fråga (för prenumeration):Ingen"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "Moderatorer"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "Moderator"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "Deltagare"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "Deltagare"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "Besökare"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "Besökare"
+
+#: ../src/common/helpers.py:358
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: ../src/common/helpers.py:360
+#, fuzzy
+msgid "Owner"
+msgstr "_Ägare"
+
+#: ../src/common/helpers.py:362
+#, fuzzy
+msgid "Administrator"
+msgstr "_Administratör"
+
+#: ../src/common/helpers.py:364
+#, fuzzy
+msgid "Member"
+msgstr "_Medlem"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "uppmärksammar konversationen"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "gör något annat"
+
+#: ../src/common/helpers.py:405
+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:408
+msgid "paused composing a message"
+msgstr "tog en paus i skrivandet"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "har stängt chattfönstret eller fliken"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Skicka meddelande"
+msgstr[1] "Skicka meddelande"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "Från %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "Från %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "Från %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "fel: kan inte öppna %s för läsning"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "skapar logdatabas"
+
+#: ../src/common/passwords.py:92
+#, fuzzy, python-format
+msgid "Gajim account %s"
+msgstr "för konto %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "Pausad"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "Fetstil"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "Har "
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Chattar"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "Fetstil"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Innehåll"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Färdig"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "_Innehåll"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Inaktiverad"
+
+#: ../src/common/pep.py:49
+#, fuzzy
+msgid "Curious"
+msgstr "_Föregående"
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Radera"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
 msgstr "Avstängd"
 
-#: ../src/config.py:231
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Avstängd"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
+msgstr "Avstängd"
+
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "_Föregående"
+
+#: ../src/common/pep.py:58
+#, fuzzy
+msgid "Excited"
+msgstr "Aktiverad"
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupp"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "_Värd:"
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "meddelande"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Aktiverad"
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "Osynlig"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "Ingen"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Värd:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "tyska"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "_Modifiera"
+
+#: ../src/common/pep.py:85
+#, fuzzy
+msgid "Nervous"
+msgstr "_Föregående"
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "Frånkopplad"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "Grupp"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "Radera"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "Avstannad"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Senast ändrad:"
+
+#: ../src/common/pep.py:98
+#, fuzzy
+msgid "Serious"
+msgstr "_Föregående"
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "Smeknamn"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "Sover"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "Gatuadress:"
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "Prenumerera"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Tid"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "Understrykning"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "Fel Lösenfras"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "Händelse"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "alla i gruppen"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Händelse"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "Sparkar %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "_Gå in i"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:144
+#, fuzzy
+msgid "Grooming"
+msgstr "Från"
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "Äter"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "Ändrar Ämne"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Sparkar %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Äter"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "enkel"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Sparkar %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "Äter"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "Loggar _ut"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "Äter"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "Anledning"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Anledning"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "Sover"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "Äter"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "Jag tittar på film."
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "Äter"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "Jag pratar i telefon."
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "Överför"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+#, fuzzy
+msgid "On a Plane"
+msgstr "_Fortsätt"
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "Öppna som _länk"
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "Arbetar"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "Skriver"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "Arbetar"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, fuzzy, python-format
+msgid "Unable to bind to port %s."
+msgstr "Lyckades inte gå med i rummet"
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Anslutning till värd kunde inte etableras: Timeout medan data skickades."
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Värden du angav för det avancerade valet ft_override_host_to_send är inte "
+"giltigt, så ignoreras."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahifel"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "Var %s _minut"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-local-meddelanden kanske inte fungerar korrekt."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "Kontrollera om Avahi är installerat."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+#, fuzzy
+msgid "Could not start local service"
+msgstr "Kunde inte ladda bild"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, fuzzy, python-format
+msgid "Unable to bind to port %d."
+msgstr "Lyckades inte gå med i rummet"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "Kontrollera om avahi-daemon körs."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, fuzzy, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunde inte ansluta till \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Du är inte ansluten eller visas inte för andra. Ditt meddelande kunde inte "
+"skickas."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[Det här meddelandet är krypterat]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
 
-#: ../src/config.py:351
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, fuzzy, python-format
+msgid "Error while adding service. %s"
+msgstr "problem vid sändning %s ( %s )"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "Avstängd"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:359
+#: ../src/config.py:329
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:682 ../src/gajim.py:2165
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "Förinställda statusmeddelanden"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "Aktivera"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Anpassa</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:683 ../src/gajim.py:2166
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2661,244 +5909,253 @@ 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:1000
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1000
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: ../src/config.py:1036
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:1037
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Nytt meddelande har mottagits"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "Nytt meddelande har mottagits"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:1039
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:1041
+#: ../src/config.py:1060
 #, fuzzy
 msgid "Group Chat Message Highlight"
 msgstr "Gruppchattsmeddelande markerat"
 
-#: ../src/config.py:1042
+#: ../src/config.py:1061
 #, fuzzy
 msgid "Group Chat Message Received"
 msgstr "Gruppchattsmeddelande mottaget"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
-#: ../src/config.py:1252
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "Namn"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "Återanslut nu?"
+
+#: ../src/config.py:1406
+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:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är oanvändbart på den här datorn"
 
-#: ../src/config.py:1298
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "Olästa händelser"
+
+#: ../src/config.py:1667
+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:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har öppnat chatt i kontot %s"
+
+#: ../src/config.py:1694
+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:1705
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1299
+#: ../src/config.py:1706
 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:1302 ../src/config.py:1896
-msgid "Unread events"
-msgstr "Olästa händelser"
-
-#: ../src/config.py:1303
+#: ../src/config.py:1710
 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:1307
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1717
 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:1312 ../src/config.py:1316
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1313
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1317
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "Hantera konton"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1332
+#: ../src/config.py:1828
 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:1391
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1392
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1520 ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Strax tillbaka."
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1530
-msgid "Relogin now?"
-msgstr "Återanslut nu?"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:1531
-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:2076
+msgid "OpenPGP Key Selection"
+msgstr "Val av OpenPGP-nyckel"
+
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:1557
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1558
+#: ../src/config.py:2089
 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:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
-#: ../src/disco.py:418 ../src/profile_window.py:323
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en förbindelse."
 
-#: ../src/config.py:1570
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "Din server stödjer inte Vcard"
 
-#: ../src/config.py:1571
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:1595 ../src/config.py:3386
-msgid "Failed to get secret keys"
-msgstr "Lyckades inte hämta hemliga nycklar"
-
-#: ../src/config.py:1596 ../src/config.py:3387
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
-
-#: ../src/config.py:1599 ../src/config.py:3390
-msgid "OpenPGP Key Selection"
-msgstr "Val av OpenPGP-nyckel"
-
-#: ../src/config.py:1600 ../src/config.py:3391
-msgid "Choose your OpenPGP key"
-msgstr "Välj din OpenPGP-nyckel"
-
-#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
-#: ../src/disco.py:1735 ../src/history_window.py:78
-msgid "Name"
-msgstr "Namn"
-
-#: ../src/config.py:1833
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1897
-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:1934
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Du har öppnat chatt i kontot %s"
-
-#: ../src/config.py:1935
-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:1994
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:1995
+#: ../src/config.py:2134
 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:2229
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2231
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2298
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2299
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2300
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2371
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2906,11 +6163,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2376
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2918,11 +6175,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2379
+#: ../src/config.py:2457
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2930,11 +6187,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2381
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2382
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2942,7 +6199,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2958,101 +6215,85 @@ 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:2488
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2505 ../src/roster_window.py:2733
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2506 ../src/roster_window.py:2729
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för konto %s"
 
-#: ../src/config.py:2507 ../src/roster_window.py:2734
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2521
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2522
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2607
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2607
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:2608
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:2609
+#: ../src/config.py:2690
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Var säker på att fylla i server- och rumfälten eller ta bort det här "
 "bokmärket."
 
-#: ../src/config.py:2973
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:2974
+#: ../src/config.py:3074
 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:2984 ../src/dialogs.py:1336
-msgid "Invalid password"
-msgstr "Ogiltigt lösenord"
-
-#: ../src/config.py:2985
-msgid "You must enter a password for the new account."
-msgstr "Du måste skriva in ett lösenord för det nya kontot."
-
-#: ../src/config.py:2989 ../src/dialogs.py:1341
-msgid "Passwords do not match"
-msgstr "Lösenorden stämmer inte överens"
-
-#: ../src/config.py:2990 ../src/dialogs.py:1342
-msgid "The passwords typed in both fields must be identical."
-msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
-
-#: ../src/config.py:3009
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "Dubblerat Jabber-ID"
 
-#: ../src/config.py:3010
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "Detta kontot är redan konfigurerat i Gajim."
 
-#: ../src/config.py:3027
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "Kontot har blivit tillagt"
 
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3119 ../src/config.py:3308
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3062,280 +6303,406 @@ 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:3062
-msgid "Your new account has been created successfully"
-msgstr "Ditt nya konto har skapats"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Ange det nya smeknamnet du vill använda:"
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "Kontakten finns redan i registret"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
 
-#: ../src/config.py:3080
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skulle skapas"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "Ditt nya konto har skapats"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3139
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr ""
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:678
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
-#: ../src/conversation_textview.py:754
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "Igår"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:792
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM-klient"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "Sätt MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Statusmeddelande"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "Skriv ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adress:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG-nummer:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ-nummer:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adress:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra adress:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 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:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Jag skulle vilja lägga till dig i mitt register."
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i registret"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "Den här kontakten finns redan i ditt register."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:951
 #, fuzzy
 msgid "User ID:"
 msgstr "Användar-ID:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:1021
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:1035
 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:779
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "Christian Bjälevik <nafallo@magicalforest.se>\n"
 "Oscar Hellström <oscar@oscarh.net>"
 
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:1210
 #, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Lyckades inte gå med i rummet"
-
-#: ../src/dialogs.py:910
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
+"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 ""
-"Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
+"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/dialogs.py:1061
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prenumerationsförfrågan för konto %s från %s"
 
-#: ../src/dialogs.py:1064
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:1124 ../src/roster_window.py:687
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i rummet %s"
 
-#: ../src/dialogs.py:1132
+#: ../src/dialogs.py:1686
 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:1147
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:1215 ../src/dialogs.py:1221
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1216 ../src/dialogs.py:1222
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:1229
+#: ../src/dialogs.py:1795
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Gömmer bannern i gruppchatfönstret"
 
-#: ../src/dialogs.py:1268
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Utan en förbindelse kan du inte ändra ditt lösenord."
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Konto \"%s\" är anslutet till servern"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:1271
+#: ../src/dialogs.py:1955
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -3345,277 +6712,384 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1296 ../src/dialogs.py:1655 ../src/dialogs.py:1786
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Förbindelse inte tillgänglig"
 
-#: ../src/dialogs.py:1297 ../src/dialogs.py:1656 ../src/dialogs.py:1787
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:1306 ../src/dialogs.py:1309
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1309
+#: ../src/dialogs.py:1992
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Lyckades inte skriva fil i %s"
 
-#: ../src/dialogs.py:1318
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "Utan en förbindelse kan du inte ändra ditt lösenord."
 
-#: ../src/dialogs.py:1337
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "Ogiltigt lösenord"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "Lösenorden stämmer inte överens"
+
+#: ../src/dialogs.py:2025
+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:1384 ../src/notify.py:211 ../src/notify.py:415
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt Loggade In"
 
-#: ../src/dialogs.py:1386 ../src/notify.py:219 ../src/notify.py:417
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
-#: ../src/dialogs.py:1388 ../src/notify.py:238 ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:1388 ../src/notify.py:223 ../src/notify.py:419
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:1389 ../src/notify.py:230 ../src/notify.py:420
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:1389 ../src/gajim.py:1225 ../src/notify.py:428
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1391 ../src/gajim.py:1378 ../src/notify.py:422
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:1393 ../src/gajim.py:1197 ../src/gajim.py:1354
-#: ../src/notify.py:424
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:1395 ../src/gajim.py:1417 ../src/gajim.py:1439
-#: ../src/gajim.py:1456 ../src/notify.py:426
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:1396 ../src/gajim.py:1420 ../src/notify.py:426
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:1398 ../src/gajim.py:1094 ../src/notify.py:430
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:1400 ../src/notify.py:203 ../src/notify.py:432
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Kontakt Loggade Ut"
 
-#: ../src/dialogs.py:1585
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enstaka Meddelande med konto %s"
 
-#: ../src/dialogs.py:1587
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enstaka Meddelande med konto %s"
 
-#: ../src/dialogs.py:1589
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1592
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1615
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1687
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1688
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1732
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#: ../src/dialogs.py:1857
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:1909
+#: ../src/dialogs.py:2628
 #, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:1912
+#: ../src/dialogs.py:2633
 #, fuzzy, python-format
-msgid "Order: %s, action: %s"
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beskrivning: %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2675
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/dialogs.py:2041
+#: ../src/dialogs.py:2762
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:2139
+#: ../src/dialogs.py:2860
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Privat Chatt"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2930
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/dialogs.py:2210
+#: ../src/dialogs.py:2931
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Du måste skriva in ett lösenord för det nya kontot."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "I gruppen"
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact har bjudit in dig till %(room_jid)s"
+
+#: ../src/dialogs.py:2968
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har bjudit in dig till %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2256
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:2328 ../src/dialogs.py:2373
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:2363
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
 #. # means number
-#: ../src/dialogs.py:2508
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2514
+#: ../src/dialogs.py:3243
 #, fuzzy
 msgid "Condition"
 msgstr "Förbindelse"
 
-#: ../src/dialogs.py:2635
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "när jag är "
 
-#: ../src/disco.py:102
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "Andra"
 
-#: ../src/disco.py:103 ../src/disco.py:104 ../src/disco.py:1283
-#: ../src/gajim.py:539 ../src/roster_window.py:271 ../src/roster_window.py:329
-#: ../src/roster_window.py:368 ../src/roster_window.py:451
-#: ../src/roster_window.py:483 ../src/roster_window.py:485
-#: ../src/roster_window.py:3896 ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267 ../src/common/helpers.py:43
-msgid "Transports"
-msgstr "Transporter"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:106
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:419
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "Utan en förbindelse kan du inte bläddra bland tillgängliga tjänster"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:500
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:644
+#: ../src/disco.py:657
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3623,179 +7097,437 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:648 ../src/disco.py:929
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:649
+#: ../src/disco.py:662
 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:729
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar %s med konto %s"
 
-#: ../src/disco.py:768
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:930
+#: ../src/disco.py:956
 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:1157 ../src/disco.py:1288
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Exekvera kommando..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1325
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "Undersöker %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1506
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1513
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1520
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1743
+#: ../src/disco.py:1818
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prenumerera"
 
-#: ../src/disco.py:1769
+#: ../src/disco.py:1826
+msgid "Node"
+msgstr "Nod"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1775
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:1781
+#: ../src/disco.py:1895
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Prenumerera"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "Hantera Historik"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "Meddelande skickat"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "ID"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP-kryptering"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Inkommande meddelande:"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "Generellt"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "Serverns funktioner"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "Förlopp"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Filöverföring avbruten"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Förbindelse med motpart kan inte etableras."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Mottagare: "
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Skriv ditt meddelande:"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:231
 #, fuzzy
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Filöverföring stoppad av motparten"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivning: %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denna fil används av en annan process."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:706
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan inte skriv över filen \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:708
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3803,31 +7535,33 @@ msgstr ""
 "En fil med det här namnet existerar redan och du har inte rättigheter att "
 "skriva över den."
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:712
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:712
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:722
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:723
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har inte rättigheter att skapa filer i den här katalogen."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Spara fil som..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3835,61 +7569,70 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ogiltig Fil"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behöver Xserver för att fungera. Avbryter..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim behöver PyGTK 2.6 eller senare"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim behöver PyGTK 2.6 eller senare för att fungera. Avbryter..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim behöver GTK 2.6 eller senare"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim behöver GTK 2.6 eller senare för att fungera. Avbryter..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime saknar libgladestöd"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3898,22 +7641,22 @@ msgstr ""
 "Vänligen ta bort din nuvarande GTK+ runtime och installera senaste stabila "
 "version från %s"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Vänligen kontrollera att GTK+ och PyGTK har libgladestöd i ditt system."
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3922,11 +7665,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:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim körs redan"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3934,177 +7677,397 @@ msgstr ""
 "En annan instans of Gajim verkar redan vara igång\n"
 "Starta ändå?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "Lösenfras krävs"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "Fel Lösenfras"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Vänligen skriv om ditt GPG-lösenord eller tryck Avbryt."
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Ditt önskade smeknamn används redan eller är registrerat av en annan "
+"deltagare.\n"
+"Vänligen ange ett annat smeknamn nedan:"
+
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gajim.py:393 ../src/notify.py:434
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Accepterar du den här förfrågan?"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Förbindelse"
 
-#: ../src/gajim.py:710
+#: ../src/gajim.py:930 ../src/gajim.py:934
 #, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Ämne: %s\n"
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:755 ../src/gajim.py:768
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/gajim.py:801
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:802
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
 
-#: ../src/gajim.py:810
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:811
-msgid "You will always see him or her as offline."
-msgstr "Du kommer alltid se honom eller henne som frånkopplad."
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:854
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:855 ../src/common/connection.py:408
-msgid "Check your connection or try again later."
-msgstr "Kontrollera din förbindelse eller försök igen senare."
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s är nu känd som %s"
 
-#: ../src/gajim.py:1004 ../src/roster_window.py:1218
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s är nu %s (%s)"
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s är nu %(status)s"
 
-#. No status message
-#: ../src/gajim.py:1007 ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1305
 #, python-format
-msgid "%s is now %s"
-msgstr "%s är nu %s"
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
 
-#: ../src/gajim.py:1104
-msgid "Your passphrase is incorrect"
-msgstr "Din lösenfras är inkorrekt."
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
 
-#: ../src/gajim.py:1105
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Det krävs en lösenfras för att ansluta till detta rum."
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "Din lösenfras är inkorrekt."
+
+#: ../src/gajim.py:1561
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny Epost på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1563
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d oläst E-postmeddelanden"
 msgstr[1] "Du har %d olästa E-postmeddelanden"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1219
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"Från: %(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s har mattagits från %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1444
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: ../src/gajim.py:1457
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "Vid varje _meddelande"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: ../src/gajim.py:1575
+#: ../src/gajim.py:1899
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Vänligen fyll i informationen för ditt nya konto</b>"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+#, fuzzy
+msgid "Error."
+msgstr "Fel:"
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Användarnamn-konflikt"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Förbindelse"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "Fråga mig i_nte igen"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "Kryptering deaktiverad"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+#, fuzzy
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan inte ansluta till ett rum när du är osynlig"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gajim.py:2113
-#, fuzzy
-msgid "Network Manager support not available"
-msgstr "En förbindelse är inte tillgänglig"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "Bokmärke finns redan"
 
-#: ../src/gajim.py:2188
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
+#: ../src/gajim.py:2998
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Rummet \"%s\" finns redan i dina bokmärken."
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "Bokmärke har blivit ordentligt tillagt"
+
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i ditt register."
+
+#: ../src/gajim-remote.py:79
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "visar hjälp för ett specifikt kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Visar eller gömmer registerfönstret"
 
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:91
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -4113,47 +8076,47 @@ msgstr ""
 "Skriv ut en lista på alla kontakter i registret. Varje kontakt hamnar på en "
 "egen rad"
 
-#: ../src/gajim-remote.py:85 ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:188 ../src/gajim-remote.py:197
-#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:238
-#: ../src/gajim-remote.py:247
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "meddelande"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4161,20 +8124,20 @@ msgstr ""
 "ändra status för konto \"konto\". Om inte specificerad, försök ändra status "
 "på alla konton som har \"synka med global status\" satt"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:128
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4185,28 +8148,30 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "pgp-nyckel"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:141
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -4217,135 +8182,144 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "subject"
 msgstr "Ämne"
 
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:146
 #, fuzzy
 msgid "message subject"
 msgstr "Meddelande Skickat"
 
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID för kontakten som kommer ta emot meddelandet"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "nyckel"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från register"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "Lägger till en kontakt till registret"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:219
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Lägger till ny kontakt till detta kontot."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande status (global status om inget konto specificerats)"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:238
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öppnar \"Starta chatt\" dialogen"
 
-#: ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:244
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "Skickar anpassad XML"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "XML to send"
 msgstr "XML-konsol"
 
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4353,39 +8327,76 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:257
 msgid "Handle a xmpp:/ uri"
 msgstr "Hantera en xmpp:/ URI"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:259
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "Anslut till nytt _rum"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:267
 #, fuzzy
 msgid "room"
 msgstr "Från"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "Rum:"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "nick"
 msgstr "Smeknamn"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Smeknamnet kunde inte hittas: %s"
+
+#: ../src/gajim-remote.py:269
 #, fuzzy
 msgid "password"
 msgstr "Lösenord:"
 
 #: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Lösenorden stämmer inte överens"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Kontrollera om avahi-daemon körs."
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Visar eller gömmer registerfönstret"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4394,29 +8405,31 @@ msgstr ""
 "\"%s\" finns inte i ditt register.\n"
 "Specificera konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:355
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Användning: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:358
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:362
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:366
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4425,153 +8438,203 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Parameter \"%s\" är inte specificerad. \n"
 "Skriv \"%s help %s\" för mer info"
 
-#: ../src/gajim-remote.py:443
-#, python-format
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Parameter \"%s\" är inte specificerad. \n"
 "Skriv \"%s help %s\" för mer info"
 
-#: ../src/gajim-remote.py:461
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Fel Lösenfras"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Du kan inte ta bort ditt nuvarande tema"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "temanamn"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "Du kan inte ta bort ditt nuvarande tema"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "Vänligen välj ett annat tema först."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privat Chatt"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Privat Chatt"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:152
 #, fuzzy, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Du är inte längre i rummet \"%s\" eller \"%s\" har lämnat."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppchatt"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppchatt"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Byt smek_namn"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "Konversationshistorik"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "Förbindelse"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Ditt nya konto har skapats"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:1142
 #, 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:840
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:1153
 #, 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:852
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Anknytning: "
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s är nu känd som %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s har blivit sparkad: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "I gruppen"
 
-#: ../src/groupchat_control.py:1063 ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174 ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1510
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Det här rummet har inget ämne"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117 ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s verkar inte vara ett giltigt JID"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Inget sådant kommondo: /%s (om du vill skicka detta, använd /say som prefix)"
-
-#: ../src/groupchat_control.py:1251
-#, python-format
-msgid "Commands: %s"
-msgstr "Kommandon: %s"
-
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1656
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4584,7 +8647,7 @@ msgstr ""
 "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 "Stödjer INTE mellanslag i smeknamn."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1663
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4593,12 +8656,7 @@ msgstr ""
 "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
 "specificerade deltagaren."
 
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Användning: /%s, tömmer fönstret från text."
-
-#: ../src/groupchat_control.py:1266
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4607,12 +8665,7 @@ msgstr ""
 "Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
 "anledning om sådan specificerades."
 
-#: ../src/groupchat_control.py:1269
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Användning: /%s, gömmer knapparna."
-
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1675
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4621,7 +8674,7 @@ msgstr ""
 "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
 "valbar anledning."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4630,7 +8683,7 @@ msgstr ""
 "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
 "med valbart smeknamn"
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1683
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4640,16 +8693,7 @@ msgstr ""
 "Användning: /%s <smeknamn> [anledning], tar bort medlemmen specificerad med "
 "smeknamn och visar en valbar anledning. Stödjer INTE mellanslag i smeknamnet."
 
-#: ../src/groupchat_control.py:1285
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
-"person. (t.ex. /%s exploderar.)"
-
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1692
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4658,22 +8702,22 @@ msgstr ""
 "Användning: /%s <smeknamn> [meddelande], öppnar ett privat meddelandefönster "
 "och skickar ett meddelande till medlemmen specificerad med smeknamn."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1697
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Användning /%s <smeknamn>, byter ditt smeknamn i aktivt rum."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1701
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1705
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4681,81 +8725,71 @@ msgstr ""
 "Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
 "kommandon."
 
-#: ../src/groupchat_control.py:1308
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjälp för /%s"
-
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1837
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Är du säker på att du vill lämna rum \"%s\"?"
 
-#: ../src/groupchat_control.py:1361
+#: ../src/groupchat_control.py:1839
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Om du stänger det här fönstret kommer du bli frånkopplad från det här rummet."
 
-#: ../src/groupchat_control.py:1365 ../src/roster_window.py:4036
-msgid "Do _not ask me again"
-msgstr "Fråga mig i_nte igen"
-
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
-#: ../src/groupchat_control.py:1435
-msgid "Bookmark already set"
-msgstr "Bokmärke finns redan"
-
-#: ../src/groupchat_control.py:1436
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
 #, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Rummet \"%s\" finns redan i dina bokmärken."
+msgid "Destroying %s"
+msgstr "Beskrivning: %s"
 
-#: ../src/groupchat_control.py:1445
-msgid "Bookmark has been added successfully"
-msgstr "Bokmärke har blivit ordentligt tillagt"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1446
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i ditt register."
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1575 ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Ett programmeringsfel har upptäckts"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4763,98 +8797,98 @@ msgstr ""
 "Det är antagligen inte förödande, men det bör rapporteras till utvecklarna "
 "likafullt."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Rapportera Bug"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 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:334
+#: ../src/gtkgui_helpers.py:396
 #, 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:650
+#: ../src/gtkgui_helpers.py:733
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - en GTK+ Jabberklient"
 
-#: ../src/gtkgui_helpers.py:651
+#: ../src/gtkgui_helpers.py:734
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Vill du skriva över den?"
 
-#: ../src/gtkgui_helpers.py:652
+#: ../src/gtkgui_helpers.py:735
 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:751
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: ../src/gtkgui_helpers.py:752
+#: ../src/gtkgui_helpers.py:805
 #, 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:761
+#: ../src/gtkgui_helpers.py:844
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Spara fil som..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 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:188
+#: ../src/history_manager.py:226
 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 "
@@ -4868,131 +8902,177 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänligen vänta..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, 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:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Fel:"
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s är nu %(status)s"
-
-#: ../src/history_window.py:268
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Kunde inte ladda bild"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr "Bild är för stor"
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "Chattar"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "Gruppchatt"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "Privat Chatt"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
+
+#: ../src/notify.py:230
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s är nu %(status)s"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggade In"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggade Ut"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt Enstaka Meddelande %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nytt Privat Meddelande från rum %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nytt meddelande från %(nickname)s"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "Generellt"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "Sökväg"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "Det finns inget sådant rum."
+
 #. keep identation
-#: ../src/profile_window.py:143
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "Kunde inte ladda bild"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:252
 #, fuzzy
 msgid "Information received"
 msgstr "Inbjudan mottagen"
 
-#: ../src/profile_window.py:324
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "Utan en förbindelse kan du inte publicera din kontaktinformation."
 
-#: ../src/profile_window.py:336
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "Skickar profil..."
 
-#: ../src/profile_window.py:351
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "Informationen INTE publicerad"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/profile_window.py:359
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -5000,83 +9080,92 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, var "
 "vänlig försök igen senare."
 
-#: ../src/roster_window.py:171 ../src/roster_window.py:226
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:344 ../src/common/helpers.py:43
-msgid "Observers"
-msgstr "Observerande"
-
-#: ../src/roster_window.py:692 ../src/roster_window.py:3201
-#, fuzzy
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Du kan inte ansluta till ett rum när du är osynlig"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "Auktorisering har sänts"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:884 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "använder konto %s"
+msgid "Now \"%s\" will know your status."
+msgstr "Nu kommer \"%s\" veta din status."
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:909
-#, python-format
-msgid "to %s account"
-msgstr "till %s konto"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "Prenumerationsförfrågan har sänts"
 
-#. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "använder %s konto"
+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."
 
-#. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "Auktorisering har tagits bort"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "för konto %s"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1009
+#: ../src/roster_window.py:1920
 #, fuzzy
-msgid "_Manage Bookmarks..."
-msgstr "Hantera bokmärken..."
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomenyckelringen är installerad men inte startad (miljövariabeln är "
+"förmodligen inte korrekt satt)"
 
-#: ../src/roster_window.py:1038
-#, python-format
-msgid "for account %s"
-msgstr "för konto %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1059
-msgid "History Manager"
-msgstr "Hantera Historik"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:1068
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "_Anslut till gruppchatt"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:1398 ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
+
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
+"historik påslagen."
+
+#: ../src/roster_window.py:2522
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Läs alla vändande händelser innan du tar bort detta konto."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:1403
+#: ../src/roster_window.py:2526
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -5085,138 +9174,70 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:2529
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:1411
+#: ../src/roster_window.py:2534
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:2668
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Kontakter"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:2669
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:2676
 #, fuzzy
 msgid "Rename Group"
 msgstr "Byt _namn"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:2677
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:2733
 #, fuzzy
 msgid "Remove Group"
 msgstr "Ta _bort"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vill du ta bort grupp %s från registret?"
 
-#: ../src/roster_window.py:1517
+#: ../src/roster_window.py:2735
 #, fuzzy
-msgid "Remove also all contacts in this group from your roster"
+msgid "Also remove all contacts in this group from your roster"
 msgstr "Ta bort en kontakt från register"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:1782 ../src/roster_window.py:2043
-#, fuzzy
-msgid "_New group chat"
-msgstr "Gruppchatt"
-
-#: ../src/roster_window.py:1913
-msgid "I would like to add you to my roster"
-msgstr "Jag skulle vilja lägga till dig i mitt register"
-
-#: ../src/roster_window.py:2088 ../src/roster_window.py:2135
-#, fuzzy
-msgid "Send Group M_essage"
-msgstr "Nytt meddelande"
-
-#: ../src/roster_window.py:2114
-msgid "Re_name"
-msgstr "Döp om"
-
-#: ../src/roster_window.py:2141
-msgid "To all users"
-msgstr "Till alla användare"
-
-#: ../src/roster_window.py:2144
-#, fuzzy
-msgid "To all online users"
-msgstr "_Anslutna användare"
-
-#: ../src/roster_window.py:2180
-msgid "_Log on"
-msgstr "Ans_lut"
-
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "K_oppla från"
-
-#: ../src/roster_window.py:2312 ../src/roster_window.py:2383
-msgid "_Change Status Message"
-msgstr "Byt _Statusmeddelande"
-
-#: ../src/roster_window.py:2455
-msgid "Authorization has been sent"
-msgstr "Auktorisering har sänts"
-
-#: ../src/roster_window.py:2456
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "Nu kommer \"%s\" veta din status."
-
-#: ../src/roster_window.py:2476
-msgid "Subscription request has been sent"
-msgstr "Prenumerationsförfrågan har sänts"
-
-#: ../src/roster_window.py:2477
-#, 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:2489
-msgid "Authorization has been removed"
-msgstr "Auktorisering har tagits bort"
-
-#: ../src/roster_window.py:2490
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "Nu kommer \"%s\" alltid se dig som offline."
-
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:2684
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5224,7 +9245,13 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:2689
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Vad vill du göra?"
+
+#: ../src/roster_window.py:3141
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5232,19 +9259,19 @@ 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:2692
+#: ../src/roster_window.py:3144
 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:2696
+#: ../src/roster_window.py:3148
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:2700
+#: ../src/roster_window.py:3152
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5253,95 +9280,34 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:2732
-msgid ""
-"Gnomekeyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-msgstr ""
-"Gnomenyckelringen är installerad men inte startad (miljövariabeln är "
-"förmodligen inte korrekt satt)"
-
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2760 ../src/common/connection.py:598
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du kommer ansluta till %s utan OpenPGP."
-
-#: ../src/roster_window.py:2777
-msgid "Passphrase Required"
-msgstr "Lösenfras krävs"
-
-#: ../src/roster_window.py:2778
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Skriv in GPG-nyckelns lösenfras för konto %s."
-
-#: ../src/roster_window.py:2783
-msgid "Save passphrase"
-msgstr "Spara lösenfras"
-
-#: ../src/roster_window.py:2791
-msgid "Wrong Passphrase"
-msgstr "Fel Lösenfras"
-
-#: ../src/roster_window.py:2792
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Vänligen skriv om ditt GPG-lösenord eller tryck Avbryt."
-
-#: ../src/roster_window.py:2849 ../src/roster_window.py:2909
-msgid "You are participating in one or more group chats"
-msgstr "Du deltar i en eller flera guppchatter"
-
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2910
-msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
-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:2867
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:2868
+#: ../src/roster_window.py:3192
 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:2966
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" av %(artist)s"
-
-#: ../src/roster_window.py:3395 ../src/roster_window.py:3402
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr ""
-"Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
-"historik påslagen."
-
-#: ../src/roster_window.py:3986
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:3988
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Din server stödjer inte att lagra informationen för metakontakter. Så den "
 "informationen kommer inte att sparas vid nästa återanslutning."
 
-#: ../src/roster_window.py:4030
+#: ../src/roster_window.py:3784
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: ../src/roster_window.py:4032
+#: ../src/roster_window.py:3786
 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 "
@@ -5351,111 +9317,326 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:4199
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Ogiltig Fil"
+
+#: ../src/roster_window.py:3910
+#, 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 vill skicka en fil till dig:"
+msgstr[1] "%s vill skicka en fil till dig:"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "Placera %s i grupp %s"
+msgid "using account %s"
+msgstr "använder konto %s"
 
-#: ../src/roster_window.py:4206
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "till %s konto"
+
+#. disco
+#: ../src/roster_window.py:4679
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Gör %s till en metakontakt för %s"
+msgid "using %s account"
+msgstr "använder %s konto"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+#, fuzzy
+msgid "_Manage Bookmarks..."
+msgstr "Hantera bokmärken..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "för konto %s"
+
+#: ../src/roster_window.py:4776
+#, python-format
+msgid "for account %s"
+msgstr "för konto %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "Byt _Statusmeddelande"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "_Publicera"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "Aktiv"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "_Upptäck tjänster..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#, fuzzy
+msgid "Send Group M_essage"
+msgstr "Nytt meddelande"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "Till alla användare"
+
+#: ../src/roster_window.py:5055
+#, fuzzy
+msgid "To all online users"
+msgstr "_Anslutna användare"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "Jag skulle vilja lägga till dig i mitt register"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Kontakter"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Skicka enstaka meddelande"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transporter"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Visa _transporter"
 
-#: ../src/roster_window.py:4393
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakt loggade ut"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Ny gruppchatt"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "Hantera Historik"
+
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+#, fuzzy
+msgid "_Join New Group Chat"
+msgstr "_Anslut till gruppchatt"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "Byt Statusmeddelande..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Ämne: %s\n"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "Gömmer denna meny"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber-ID:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, 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:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Senaste status på %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "från %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "Förbindelse"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontakt loggade ut"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "Rum:"
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "Aktiverad"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "Typ:"
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "Nerladdning"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "Uppladdning"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Färdig"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pausad"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5463,25 +9644,25 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "från %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:311
 #, fuzzy
-msgid "Affiliation:"
-msgstr "Anknytning: "
+msgid "<b>Affiliation:</b>"
+msgstr "<b>Program</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5489,7 +9670,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5497,1460 +9678,432 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 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:291
+#: ../src/vcard.py:325
 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:299
+#: ../src/vcard.py:332
 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:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr " resurs med prioritet "
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "skapar logdatabas"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, fuzzy, python-format
-msgid "%s is a file but it should be a directory"
-msgstr "%s är en fil, men borde vara en katalog"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim kommer nu avslutas"
-
-#: ../src/common/check_paths.py:115
-#, fuzzy, python-format
-msgid "%s is a directory but should be a file"
-msgstr "%s är en katalog, men borde vara en fil"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "skapar katalogen %s"
-
-#: ../src/common/commands.py:69
-#, fuzzy
-msgid "Change status information"
-msgstr "Kontaktinformation"
-
-#: ../src/common/commands.py:82
-#, fuzzy
-msgid "Change status"
-msgstr "Kontakt Loggade Ut"
-
-#: ../src/common/commands.py:83
-msgid "Set the presence type and description"
-msgstr ""
-
-#: ../src/common/commands.py:89
-#, fuzzy
-msgid "Free for chat"
-msgstr "Ledig för chatt"
-
-#: ../src/common/commands.py:90
-#, fuzzy
-msgid "Online"
-msgstr "_Fortsätt"
-
-#: ../src/common/commands.py:92
-msgid "Extended away"
-msgstr "Inte tillgänglig"
-
-#: ../src/common/commands.py:93
-msgid "Do not disturb"
-msgstr "Stör inte"
-
-#: ../src/common/commands.py:94
-msgid "Offline - disconnect"
-msgstr "Frånkopplad - Koppla från"
-
-#: ../src/common/commands.py:99
-#, fuzzy
-msgid "Presence description:"
-msgstr "Beskrivning"
-
-#: ../src/common/commands.py:134
-msgid "The status has been changed."
-msgstr "Statusen har ändrats."
-
-#: ../src/common/commands.py:179
-#, fuzzy, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s: %(message)s"
-
-#: ../src/common/commands.py:183
-#, fuzzy
-msgid "You have not joined a groupchat."
-msgstr "I gruppen"
-
-#: ../src/common/commands.py:189
-#, fuzzy
-msgid "Leave Groupchats"
-msgstr "Gruppchatt"
-
-#: ../src/common/commands.py:190
-msgid "Choose the groupchats you want to leave"
-msgstr "Välj de gruppchattar du vill lämna"
-
-#: ../src/common/commands.py:194
-#, fuzzy
-msgid "Groupchats"
-msgstr "Gruppchatt"
-
-#: ../src/common/commands.py:230
-#, fuzzy
-msgid "You leaved the following groupchats:"
-msgstr "Du är redan i rummet %s"
-
-#: ../src/common/config.py:56
-#, fuzzy
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Använd DBus och Notification-Daemon för att visa meddelanden"
-
-#: ../src/common/config.py:61
-msgid "Time in minutes, after which your status changes to away."
-msgstr "Tid i minuter tills din status ändras till borta."
-
-#: ../src/common/config.py:62
-msgid "Away as a result of being idle"
-msgstr "Borta på grund av inaktivitet"
-
-#: ../src/common/config.py:64
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tid i minuter tills din status ändras till inte tillgänglig."
-
-#: ../src/common/config.py:65
-msgid "Not available as a result of being idle"
-msgstr "Inte tillgänglig på grund av inaktivitet"
-
-#: ../src/common/config.py:83
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr ""
-
-#: ../src/common/config.py:88
-#, fuzzy
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Aktivera link-local-/zeroconf-meddelanden"
-
-#: ../src/common/config.py:91
-#, fuzzy
-msgid "Language used by speller"
-msgstr "Språk använt av stavaren"
-
-#: ../src/common/config.py:92
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"\"alltid\" - skriv ut tid för varje meddelande.\n"
-"\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
-"\"aldrig\" - skriv aldrig ut tid."
-
-#: ../src/common/config.py:93
-msgid ""
-"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/common/config.py:96
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Behandla par av * / _ som möliga formateringstecken."
-
-#: ../src/common/config.py:97
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr ""
-"Om True tas inte */_ bort. *abc* blir fetstil men * * / / _ _ inte borttagna."
-
-#: ../src/common/config.py:100
-msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
-msgstr ""
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Tecken att lägga till efter smeknamnet när du använder "
-"smeknamnskomplettering (tabb) i gruppchatt."
-
-#: ../src/common/config.py:110
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr ""
-"Teckens som föreslås läggas till efter ditt valda smeknamn om smeknamnet "
-"används av någon annan i gruppchatten."
-
-#: ../src/common/config.py:133
-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 ""
-"Det här valet låter dig anpassa tidsstämplar som skrivs ut i konversationer. "
-"T.ex. \"[%H:%M] \" kommer visa \"[timme:minut] \". Läs python-manualen om "
-"strftime för full dokumentation: http://docs.python.org/lib/module-time.html"
-
-#: ../src/common/config.py:134
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
-
-#: ../src/common/config.py:135
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "Lägg till * och [n] i registerfönstrets titel."
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr ""
-"Hur många rader som skall kommas ihåg från tidigare konversation när en "
-"chatt-flik/fönster öppnas igen."
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr ""
-"Mur många minuter skall de sista raderna från tidigare konversation sparas."
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-"Skicka meddelande med Ctrl+Enter och gör radbryt med Enter (Mirabilis ICQ "
-"Klientens standardbeteende)."
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
-msgstr ""
-"Skriv in url med %s i där %s är ordet/frasen eller 'WIKTIONARY' vilket "
-"betyder att wiktionary skall användas."
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Om ibockad kan Gajim bli fjärrstyrd med gajim-remote."
-
-#: ../src/common/config.py:154
-#, fuzzy
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"Om True, lyssna efter D-Bussignaler från NetworkManager och ändra statusen "
-"för konton (om de nu inte har listen_to_network_manager satt till False och "
-"dem synkar med global status) baserat på om nätverkets status."
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr ""
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr ""
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Fråga innan gruppchattflik eller -fönster stängs."
-
-#: ../src/common/config.py:160
-#, fuzzy
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
-"rum (jid) stängs."
-
-#: ../src/common/config.py:161
-#, fuzzy
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr ""
-"Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
-"rum (jid) stängs."
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr ""
-"Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
-"port forwarding."
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standarden säger att KiB = 1024 bytes, KB = 1000 bytes."
-
-#: ../src/common/config.py:168
-#, fuzzy
-msgid "Notify of events in the system trayicon."
-msgstr "Notifiera om händelser in systemets statusikon."
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "Visa flik när endast en konversation är aktiv?"
-
-#: ../src/common/config.py:175
-#, fuzzy
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "Visa flikkant om endast en konversation är aktiv?"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "Visa stängknapp i flik?"
-
-#: ../src/common/config.py:189
-#, fuzzy
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
-
-#: ../src/common/config.py:190
-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 ""
-"Om True avslutar Gajim när fönsterhanterarens X-knapp trycks på. Denna "
-"inställning behandlas bara när aktivitetsfältet används."
-
-#: ../src/common/config.py:191
-#, fuzzy
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"Om True kommer Gajim att visa en ikon på varje flik som innehåller olästa "
-"meddelanden. Beroende på tema kan denna ikon vara animerad."
-
-#: ../src/common/config.py:193
-#, fuzzy
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-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:195
-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 ""
-"Om True kommer Gajim att fråga alla kontakter som antingen inte hade en "
-"avatar, eller som har en för gammal cachad avatar om deras nuvarande avatar."
-
-#: ../src/common/config.py:196
-#, fuzzy
-msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes his or her status and/or his or her status message."
-msgstr ""
-"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:197
-msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
-"group chat."
-msgstr ""
-
-#: ../src/common/config.py:199
-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:200
-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:202
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr ""
-
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr "Visa inte avatar för transporten själv."
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "Visa inte registret i systemets fönsterlista."
-
-#: ../src/common/config.py:205
-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 ""
-"Om True och GTK+ och PyGTK är av version 2.8 eller högre kommer fönstret att "
-"blinka (standardbeteende i de flesta fönsterhanterare) när det finns "
-"väntande händelser."
-
-#: ../src/common/config.py:207
-#, fuzzy
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"Jabberd1.4 tycker inte om SHA-info när man ansluter till ett "
-"lösenordsskyddat rum. Sätt denna inställning till False för att inte skicka "
-"SHA-info i gruppchattnärvaroinformation"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-#, fuzzy
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"Kontrollerar fönstret där nya meddelanden placeras.\n"
-"'always' - Alla meddelanden öppnas i ett gemensamt fönster.\n"
-"'never' - Alla meddelanden öppnas i sitt eget fönster.\n"
-"'peracct' - Meddelanden från varje konto skickas till specifikt fönster.\n"
-"'pertype' - Varje meddelandetyp (t.ex. enstaka meddelande eller gruppchatt) "
-"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:211
-#, 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:212
-#, 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:213
-#, fuzzy
-msgid "Hides the buttons in group chat window."
-msgstr "Gömmer knapparna i gruppchattfönstret"
-
-#: ../src/common/config.py:214
-#, fuzzy
-msgid "Hides the buttons in two persons chat window."
-msgstr "Gömmer knapparna i tvåpersoners chattfönster"
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "Gömmer bannern i gruppchatfönstret"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "Gömmer bannern i tvåpersoners chattfönster"
-
-#: ../src/common/config.py:217
-#, fuzzy
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Gömmer deltagarelistan i gruppchatfönstret"
-
-#: ../src/common/config.py:218
-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 ""
-"I en chatt, visa bara smeknamnet vid början av en rad om det inte är samma "
-"person som pratar som i förra meddelandet."
-
-#: ../src/common/config.py:219
-msgid "Indentation when using merge consecutive nickname."
-msgstr ""
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr ""
-"Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl+Tab går till nästa författningsflik när ingen är oläst."
-
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr ""
-
-#: ../src/common/config.py:223
-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:224
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-
-#: ../src/common/config.py:225
-msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
-"group rows."
-msgstr ""
-
-#: ../src/common/config.py:226
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
-msgstr ""
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr " resurs med prioritet "
 
-#: ../src/common/config.py:237
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr ""
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP-kryptering"
 
-#. yes, no, ask
-#: ../src/common/config.py:266
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 workaround"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr ""
+#~ "%s har inte sänt ut en OpenPGP-nyckel och du har inte heller tilldelat en"
 
-#: ../src/common/config.py:270
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"If ibockad kommer Gajim kommer gajim att använda ditt IP och proxies "
-"definerade i file_transfer_proxies under inställningar för filöverföringar."
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "Inget sådant kommondo: /%s (om du vill skicka detta, använd /say som "
+#~ "prefix)"
 
-#: ../src/common/config.py:329
 #, fuzzy
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "OpenPGP är inte användbart på den här datorn"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Användning: /%s <handling>, skickar handling till aktivt rum. Använd "
+#~ "tredje person. (t.ex. /%s exploderar.)"
 
-#: ../src/common/config.py:330 ../src/common/config.py:333
-msgid "Language for which we want to check misspelled words"
-msgstr "Språk för vilket vi vill titta efter felstavade ord"
+#~ msgid "Encryption enabled"
+#~ msgstr "Kryptering aktiverad"
 
-#: ../src/common/config.py:339
-msgid "all or space separated status"
-msgstr "alla eller mellanslagsseparerad status"
+#~ msgid "Encryption disabled"
+#~ msgstr "Kryptering deaktiverad"
 
-#: ../src/common/config.py:340
-msgid "'yes', 'no', or 'both'"
-msgstr "\"yes\", \"no\" eller \"båda\""
+#~ msgid "<b>Please fill in the data for your new account</b>"
+#~ msgstr "<b>Fyll i informationen för ditt nya konto</b>"
 
-#: ../src/common/config.py:341 ../src/common/config.py:343
-#: ../src/common/config.py:344 ../src/common/config.py:347
-#: ../src/common/config.py:348
-msgid "'yes', 'no' or ''"
-msgstr "\"yes\", \"no\" eller \"\""
-
-#: ../src/common/config.py:354
-msgid "Sleeping"
-msgstr "Sover"
-
-#: ../src/common/config.py:355
-msgid "Back soon"
-msgstr "Snart tillbaka"
+#~ msgid "_Retype Password:"
+#~ msgstr "Skriv om _lösenord:"
 
-#: ../src/common/config.py:355
-msgid "Back in some minutes."
-msgstr "Tillbaka om några minuter."
+#~ msgid "_Use proxy"
+#~ msgstr "_Använd proxy"
 
-#: ../src/common/config.py:356
-msgid "Eating"
-msgstr "Äter"
+#~ 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 "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Om kryssad kommer alla lokala kontakter som använder en Bonjour-"
+#~ "kompatibel chattklient (som iChat, Trillian eller Gaim) visas i "
+#~ "registret. Du behöver inte vara ansluten till en jabberserver för att det "
+#~ "ska fungera.Alternativet är bara tillgängligt om python-avahi är "
+#~ "installerat och avahi-daemon körs."
 
-#: ../src/common/config.py:356
-msgid "I'm eating, so leave me a message."
-msgstr "Jag äter, så lämna ett meddelande."
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Om du har två eller fler konton och det här är kryssat kommer Gajim lista "
+#~ "alla kontakter som om du hade ett konto"
 
-#: ../src/common/config.py:357
-msgid "Movie"
-msgstr "Film"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "Använd _link-local-meddelanden"
 
-#: ../src/common/config.py:357
-msgid "I'm watching a movie."
-msgstr "Jag tittar på film."
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "Klicka för att visa tidigare konversationer med den här kontakten"
 
-#: ../src/common/config.py:358
-msgid "Working"
-msgstr "Arbetar"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompakt vy    Alt+C"
 
-#: ../src/common/config.py:358
-msgid "I'm working."
-msgstr "Jag arbetar."
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "Klicka för att visa tidigare konversationer i det här rummet"
 
-#: ../src/common/config.py:359
-msgid "Phone"
-msgstr "Telefon"
+#~ msgid "Build custom query"
+#~ msgstr "Bygg egen fråga"
 
-#: ../src/common/config.py:359
-msgid "I'm on the phone."
-msgstr "Jag pratar i telefon."
+#~ msgid "Query Builder..."
+#~ msgstr "Frågebyggare..."
 
-#: ../src/common/config.py:360
-msgid "Out"
-msgstr "Ute"
+#~ msgid "Accept"
+#~ msgstr "Acceptera"
 
-#: ../src/common/config.py:360
-#, fuzzy
-msgid "I'm out enjoying life."
-msgstr "Jag är ute och njuter av livet."
-
-#: ../src/common/config.py:364
-#, fuzzy
-msgid "I'm available."
-msgstr "Tillgänglig"
-
-#: ../src/common/config.py:365
-#, fuzzy
-msgid "I'm free for chat."
-msgstr "Ledig för chatt"
+#~ msgid "Invitation Received"
+#~ msgstr "Inbjudan mottagen"
 
-#: ../src/common/config.py:367
-#, fuzzy
-msgid "I'm not available."
-msgstr "Tjänst är inte tillgänglig"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>Format av en rad</b>"
 
-#: ../src/common/config.py:368
-msgid "Do not disturb."
-msgstr "Stör inte."
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Gränssnittsanpassning</b>"
 
-#: ../src/common/config.py:369 ../src/common/config.py:370
-msgid "Bye!"
-msgstr "Hejdå!"
+#~ msgid "Also known as iChat style"
+#~ msgstr "Också känt som iChat-stil"
 
-#: ../src/common/config.py:379
-#, fuzzy
-msgid ""
-"Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
-msgstr ""
-"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:380
-msgid "Sound to play when any MUC message arrives."
-msgstr "Ljud att spela när ett MUC-meddelande inkommer."
-
-#: ../src/common/config.py:389 ../src/common/optparser.py:193
-msgid "green"
-msgstr "grön"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "Ett exempel: Om du har aktiverat statusmeddelanden för frånvarande kommer "
+#~ "Gajim inte fråga dig efter ett statusmeddelande när du byter status till "
+#~ "frånvarande.Det kommer använda ditt förinställda satt här"
 
-#: ../src/common/config.py:393 ../src/common/optparser.py:179
-msgid "grocery"
-msgstr "grönsaker"
+#~ msgid "Chat"
+#~ msgstr "Chatt"
 
-#: ../src/common/config.py:397
-msgid "human"
-msgstr "mänsklig"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "_Var 5:e minut"
 
-#: ../src/common/config.py:401
-msgid "marine"
-msgstr "marin"
+#~ msgid "Events"
+#~ msgstr "Händelser"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "Lyckades inte ladda tomgångsmodul"
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr ""
+#~ "Gajim kommer automatiskt visa nya inkommande händelser genom att öppna "
+#~ "relevant fönster"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-#, fuzzy
-msgid "Wrong host"
-msgstr "Fel Lösenfras"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim kommer att meddela dig om nya händelser via en popup i höger "
+#~ "nederkant av skärmen"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Värden du angav för det avancerade valet ft_override_host_to_send är inte "
-"giltigt, så ignoreras."
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim kommer meddela dig via ett popup-fönster i det nedre högra hörnet "
+#~ "av skärmen om kontakter som just loggat in"
 
-#: ../src/common/connection_handlers.py:590
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registreringsinformation för transport %s har inte kommit fram i tid"
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim kommer endast byta ikonen för kontakten som skickade den nya "
+#~ "händelsen"
 
-#: ../src/common/connection_handlers.py:1543
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Smeknamnet kunde inte hittas: %s"
+#~ 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 ""
+#~ "Om kryssad kommer Gajim komma ihåg registrets och chattfönstrens "
+#~ "positioner och storlekar på skärmen nästa gång de används"
 
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1620
-#: ../src/common/connection_handlers.py:1628
-#, fuzzy
-msgid "Unable to join group chat"
-msgstr "Lyckades inte gå med i rummet"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "Aldrig\n"
+#~ "Alltid\n"
+#~ "Per konto\n"
+#~ "Per typ"
 
-#: ../src/common/connection_handlers.py:1606
-#, fuzzy
-msgid "A password is required to join this group chat."
-msgstr "Det krävs en lösenfras för att ansluta till detta rum."
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Utgående chattstatusnoti_fieringar:"
 
-#: ../src/common/connection_handlers.py:1609
-#, fuzzy
-msgid "You are banned from this group chat."
-msgstr "Du är bannlyst från detta rummet."
+#~ msgid "Print time:"
+#~ msgstr "Skriv ut tid:"
 
-#: ../src/common/connection_handlers.py:1612
-#, fuzzy
-msgid "Such group chat does not exist."
-msgstr "Det finns inget sådant rum."
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Spara _position och storlek för register- och chattfönster"
 
-#: ../src/common/connection_handlers.py:1615
-#, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "Möjligheten att skapa rum är begränsad."
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "Sätt statusmeddelandet till nu spelandes _musikspår"
 
-#: ../src/common/connection_handlers.py:1618
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerade smeknamn måste användas."
+#~ msgid "Show only in _roster"
+#~ msgstr "Visa enbart i _registret"
 
-#: ../src/common/connection_handlers.py:1621
-msgid "You are not in the members list."
-msgstr "Du är inte med i medlemslistan."
+#~ msgid "The auto away status message"
+#~ msgstr "Det automatiska statusmeddelandet när du är frånvarande"
 
-#: ../src/common/connection_handlers.py:1629
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt önskade smeknamn används redan eller är registrerat av en annan "
-"deltagare.\n"
-"Vänligen ange ett annat smeknamn nedan:"
+#~ msgid "The auto not available status message"
+#~ msgstr "Det automatiska statusmeddelandet när du inte är tillgänglig"
 
-#: ../src/common/connection_handlers.py:1679
-msgid "I would like to add you to my roster."
-msgstr "Jag skulle vilja lägga till dig i mitt register."
+#~ msgid "Treat all incoming messages as:"
+#~ msgstr "Behandla alla inkommande meddelanden som:"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1700
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi prenumererar nu på %s"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
-#: ../src/common/connection_handlers.py:1702
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "avprenumerationsförfrågan från %s"
+#~ 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 "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "När en ny händelse (meddelande, filöverföringförfrågan etc...) mottas kan "
+#~ "följande metoder användas för att informera dig om det. Observera att "
+#~ "händelser rörande nya meddelanden endast används om det är ett nytt "
+#~ "meddelande från en kontakt du inte redan chattar med"
 
-#: ../src/common/connection_handlers.py:1704
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi prenumererar inte längre på %s"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "Fungerar för Rhythmbox och Muine. För fler spelare, se http://trac.gajim."
+#~ "org/wiki/GajimAndMusicPlayer"
 
-#: ../src/common/connection_handlers.py:1874
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s följer inte RFC. Dt kommer inte att läggas till till ditt register. "
-"Använd registerhanteringsverktyg så som http://jru.jabberstudio.org/  för "
-"att ta bort det"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "_Avancerad notifieringskontroll..."
 
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Anslutningen med konto \"%s\" har brutits"
+#~ msgid "_Font:"
+#~ msgstr "_Teckensnitt:"
 
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "Återanslut manuellt."
+#~ msgid "_Never"
+#~ msgstr "_Aldrig"
 
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, fuzzy, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transporten %s svarade felaktigt på en registreringsbegäran."
+#~ msgid "_Notify me about it"
+#~ msgstr "_Notifiera mig om det"
 
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "Ogiltigt lösenord"
+#~ msgid "_Player:"
+#~ msgstr "_Spelare:"
 
-#: ../src/common/connection.py:407 ../src/common/connection.py:442
-#: ../src/common/connection.py:900
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Kunde inte ansluta till \"%s\""
+#~ msgid "_Pop it up"
+#~ msgstr "_Öppna det"
 
-#: ../src/common/connection.py:421
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Ansluten till server %s:%s med %s"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ../src/common/connection.py:443
-msgid "Check your connection or try again later"
-msgstr "Kontrollera din förbindelse eller försök igen"
+#~ msgid "Address"
+#~ msgstr "Adress"
 
-#: ../src/common/connection.py:469
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Inloggning misslyckades med \"%s\""
+#~ msgid "City:"
+#~ msgstr "Ort:"
 
-#: ../src/common/connection.py:470
-msgid "Please check your login and password for correctness."
-msgstr "Kontrollera ditt inloggningsnamn och lösenord."
+#~ msgid "Company:"
+#~ msgstr "Företag:"
 
-#: ../src/common/connection.py:497
-#, fuzzy
-msgid "Error while removing privacy list"
-msgstr "problem vid sändning %s ( %s )"
+#~ msgid "Country:"
+#~ msgstr "Land:"
 
-#: ../src/common/connection.py:498
-#, python-format
-msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Desactivate it and try again."
-msgstr ""
+#~ msgid "Given:"
+#~ msgstr "Förnamn:"
 
-#. We didn't set a passphrase
-#: ../src/common/connection.py:596
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Lösenordsfras för OpenPGP angavs inte"
+#~ msgid "Middle:"
+#~ msgstr "Mellannamn:"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:638
-msgid "invisible"
-msgstr "osynlig"
+#~ msgid "Position:"
+#~ msgstr "Position:"
 
-#: ../src/common/connection.py:639
-msgid "offline"
-msgstr "frånkopplad"
+#~ msgid "Prefix:"
+#~ msgstr "Prefix:"
 
-#: ../src/common/connection.py:640
-#, python-format
-msgid "I'm %s"
-msgstr "Jag är %s"
+#~ msgid "Role:"
+#~ msgstr "Roll:"
 
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:731
-#, fuzzy
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Det här meddelandet är krypterat]"
+#~ msgid "State:"
+#~ msgstr "Delstat:"
 
-#: ../src/common/connection.py:787
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Ämne: %s\n"
-"%s"
+#~ msgid "Suffix:"
+#~ msgstr "Suffix:"
 
-#: ../src/common/connection.py:926
-msgid "Not fetched because of invisible status"
-msgstr "Inte hämtad på grund av osynlig status"
+#~ msgid "_Remove from Roster"
+#~ msgstr "Ta bo_rt från register"
 
-#: ../src/common/contacts.py:271
-#, fuzzy
-msgid "Not in roster"
-msgstr "Inte i registret"
+#~ msgid "A_ccounts"
+#~ msgstr "_Konton"
 
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python-bindningar saknas på den här datorn"
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
 
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajims D-Bus-egenskaper kan inte användas"
+#~ msgid "Ask:"
+#~ msgstr "Fråga:"
 
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
+#~ msgid "Client:"
+#~ msgstr "Klient:"
 
-#: ../src/common/exceptions.py:30
-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"
+#~ msgid "OS:"
+#~ msgstr "OS:"
 
-#: ../src/common/exceptions.py:38
-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"
+#~ msgid "Subscription:"
+#~ msgstr "Prenumeration:"
 
-#: ../src/common/exceptions.py:46
-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 ""
+#~ "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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Om det inte är språket för vilket du vill markera felstavade ord, sätt "
+#~ "din $LANG variabel rätt. T.ex. för svenska gör export LANG=sv_SE eller "
+#~ "export LANG=sv_SE.UTF-8 i ~/.bash_profile eller för att göra det globalt "
+#~ "i /etc/profile.\n"
+#~ "\n"
+#~ "Funktionen \"markera felstavade ord\" kommer inte att användas"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "one"
-msgstr "Ingen"
+#~ msgid "Every %s _minutes"
+#~ msgstr "Var %s _minut"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "two"
-msgstr "vem"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Du måste skriva in ett lösenord för det nya kontot."
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "three"
-msgstr "Gatuadress:"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "Du kommer alltid se honom eller henne som frånkopplad."
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "four"
-msgstr "Port: "
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s är nu %s (%s)"
 
-#: ../src/common/fuzzyclock.py:42
-#, fuzzy
-msgid "five"
-msgstr "fil"
+#~ msgid "%s is now %s"
+#~ msgstr "%s är nu %s"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "sex"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "Från: %(from_address)s"
 
-#: ../src/common/fuzzyclock.py:43
 #, fuzzy
-msgid "seven"
-msgstr "Händelse"
-
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "åtta"
+#~ msgid "Network Manager support not available"
+#~ msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/common/fuzzyclock.py:43
-#, fuzzy
-msgid "nine"
-msgstr "_Fortsätt"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "tio"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Användning: %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/fuzzyclock.py:43
-#, fuzzy
-msgid "eleven"
-msgstr "Radera"
+#~ msgid "Private Chat"
+#~ msgstr "Privat Chatt"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "tolv"
+#~ msgid "Group Chat"
+#~ msgstr "Gruppchatt"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s verkar inte vara ett giltigt JID"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem över $0"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 #, fuzzy
-msgid "ten past $0"
-msgstr "Registrera till %s"
+#~ msgid "_New group chat"
+#~ msgstr "Gruppchatt"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart över $0"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "tio i halv $1"
+#~ msgid "_Log on"
+#~ msgstr "Ans_lut"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fem i halv $1"
+#~ msgid "Log _off"
+#~ msgstr "K_oppla från"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "halv $1"
+#~ msgid "Save passphrase"
+#~ msgstr "Spara lösenfras"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "twenty five to $1"
-msgstr "Registrera till %s"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Placera %s i grupp %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "twenty to $1"
-msgstr "Registrera till %s"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Gör %s till en metakontakt för %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 #, fuzzy
-msgid "quarter to $1"
-msgstr "Registrera till %s"
+#~ msgid "Affiliation:"
+#~ msgstr "Anknytning: "
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 #, fuzzy
-msgid "ten to $1"
-msgstr "Registrera till %s"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Gömmer knapparna i tvåpersoners chattfönster"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "five to $1"
-msgstr "Registrera till %s"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "Ansluten till server %s:%s med %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1"
+#~ msgid "invisible"
+#~ msgstr "osynlig"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Night"
-msgstr "Natt"
+#~ msgid "offline"
+#~ msgstr "frånkopplad"
 
-#: ../src/common/fuzzyclock.py:64
-msgid "Early morning"
-msgstr "Tidig morgon"
+#~ msgid "I'm %s"
+#~ msgstr "Jag är %s"
 
-#: ../src/common/fuzzyclock.py:64
 #, fuzzy
-msgid "Morning"
-msgstr "Arbetar"
-
-#: ../src/common/fuzzyclock.py:64
-msgid "Almost noon"
-msgstr ""
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "Gajim - ett oläst enstaka meddelande"
+#~ msgstr[1] "Gajim - %d olästa enstaka meddelanden"
 
-#: ../src/common/fuzzyclock.py:65
 #, fuzzy
-msgid "Noon"
-msgstr "Ingen"
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "Gajim - ett oläst gruppchatmeddelande"
+#~ msgstr[1] "Gajim - %d olästa gruppchatmeddelanden"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Afternoon"
-msgstr "Eftermiddag"
-
-#: ../src/common/fuzzyclock.py:65
 #, fuzzy
-msgid "Evening"
-msgstr "Händelse"
-
-#: ../src/common/fuzzyclock.py:65
-msgid "Late evening"
-msgstr "Sen kväll"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Start of week"
-msgstr "Början av veckan"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "Middle of week"
-msgstr "Mitt i veckan"
-
-#: ../src/common/fuzzyclock.py:67
-msgid "End of week"
-msgstr "Slutet av veckan"
-
-#: ../src/common/fuzzyclock.py:68
-msgid "Weekend!"
-msgstr "Helg!"
-
-#: ../src/common/helpers.py:114
-msgid "Invalid character in username."
-msgstr "Ogiltigt tecken i användarnamn"
-
-#: ../src/common/helpers.py:119
-msgid "Server address required."
-msgstr "Serveradress krävs."
-
-#: ../src/common/helpers.py:124
-msgid "Invalid character in hostname."
-msgstr "Ogiltigt tecken i värdnamn."
-
-#: ../src/common/helpers.py:130
-msgid "Invalid character in resource."
-msgstr "Ogiltigt tecken i resurs."
-
-#. GiB means gibibyte
-#: ../src/common/helpers.py:170
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:173
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:177
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "Gajim - ett oläst privat meddelande"
+#~ msgstr[1] "Gajim - %d olästa privata meddelanden"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:180
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:184
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:187
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:190
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:219
-msgid "_Busy"
-msgstr "_Upptagen"
-
-#: ../src/common/helpers.py:221
-msgid "Busy"
-msgstr "Upptagen"
-
-#: ../src/common/helpers.py:224
-msgid "_Not Available"
-msgstr "_Inte tillgänglig"
-
-#: ../src/common/helpers.py:229
-msgid "_Free for Chat"
-msgstr "_Ledig för chatt"
-
-#: ../src/common/helpers.py:231
-msgid "Free for Chat"
-msgstr "Ledig för chatt"
-
-#: ../src/common/helpers.py:234
-msgid "_Available"
-msgstr "_Tillgänglig"
-
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Tillgänglig"
-
-#: ../src/common/helpers.py:238
-msgid "Connecting"
-msgstr "Upprättar förbindelse"
-
-#: ../src/common/helpers.py:241
-msgid "A_way"
-msgstr "_Borta"
-
-#: ../src/common/helpers.py:246
-msgid "_Offline"
-msgstr "_Frånkopplad"
-
-#: ../src/common/helpers.py:248
-msgid "Offline"
-msgstr "Frånkopplad"
-
-#: ../src/common/helpers.py:251
-msgid "_Invisible"
-msgstr "_Osynlig"
-
-#: ../src/common/helpers.py:257
-msgid "?contact has status:Unknown"
-msgstr "?kontakt har status:Okänd"
-
-#: ../src/common/helpers.py:259
-msgid "?contact has status:Has errors"
-msgstr "?kontakt har status:Har fel"
-
-#: ../src/common/helpers.py:264
-msgid "?Subscription we already have:None"
-msgstr "?Prenumeration vi redan har:Ingen"
-
-#: ../src/common/helpers.py:266
-msgid "To"
-msgstr "Till"
-
-#: ../src/common/helpers.py:270
-msgid "Both"
-msgstr "Båda"
-
-#: ../src/common/helpers.py:278
-msgid "?Ask (for Subscription):None"
-msgstr "?Fråga (för prenumeration):Ingen"
-
-#: ../src/common/helpers.py:280
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: ../src/common/helpers.py:289
-msgid "?Group Chat Contact Role:None"
-msgstr "?Gruppchatt kontaktroll:Ingen"
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#: ../src/common/helpers.py:292
-msgid "Moderators"
-msgstr "Moderatorer"
-
-#: ../src/common/helpers.py:294
-msgid "Moderator"
-msgstr "Moderator"
-
-#: ../src/common/helpers.py:297
-msgid "Participants"
-msgstr "Deltagare"
-
-#: ../src/common/helpers.py:299
-msgid "Participant"
-msgstr "Deltagare"
-
-#: ../src/common/helpers.py:302
-msgid "Visitors"
-msgstr "Besökare"
-
-#: ../src/common/helpers.py:304
-msgid "Visitor"
-msgstr "Besökare"
-
-#: ../src/common/helpers.py:310
-#, fuzzy
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Gruppchatt kontaktroll:Ingen"
-
-#: ../src/common/helpers.py:312
-#, fuzzy
-msgid "Owner"
-msgstr "_Ägare"
-
-#: ../src/common/helpers.py:314
-#, fuzzy
-msgid "Administrator"
-msgstr "_Administratör"
-
-#: ../src/common/helpers.py:316
-#, fuzzy
-msgid "Member"
-msgstr "_Medlem"
-
-#: ../src/common/helpers.py:355
-msgid "is paying attention to the conversation"
-msgstr "uppmärksammar konversationen"
-
-#: ../src/common/helpers.py:357
-msgid "is doing something else"
-msgstr "gör något annat"
-
-#: ../src/common/helpers.py:359
-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:362
-msgid "paused composing a message"
-msgstr "tog en paus i skrivandet"
-
-#: ../src/common/helpers.py:364
-msgid "has closed the chat window or tab"
-msgstr "har stängt chattfönstret eller fliken"
-
-#: ../src/common/helpers.py:890
-#, fuzzy, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - ett oläst meddelande"
-msgstr[1] "Gajim - %d olästa meddelanden"
-
-#: ../src/common/helpers.py:896
-#, fuzzy, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - ett oläst enstaka meddelande"
-msgstr[1] "Gajim - %d olästa enstaka meddelanden"
-
-#: ../src/common/helpers.py:902
-#, fuzzy, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - ett oläst gruppchatmeddelande"
-msgstr[1] "Gajim - %d olästa gruppchatmeddelanden"
-
-#: ../src/common/helpers.py:908
-#, fuzzy, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - ett oläst privat meddelande"
-msgstr[1] "Gajim - %d olästa privata meddelanden"
-
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#. we talk about a file
-#: ../src/common/optparser.py:59
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fel: kan inte öppna %s för läsning"
-
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:188 ../src/common/optparser.py:189
-msgid "cyan"
-msgstr "cyan"
-
-#: ../src/common/optparser.py:306
-#, fuzzy
-msgid "migrating logs database to indices"
-msgstr "skapar logdatabas"
-
-#: ../src/common/passwords.py:82
-#, fuzzy, python-format
-msgid "Gajim account %s"
-msgstr "för konto %s"
-
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr ""
-"Anslutning till värd kunde inte etableras: Felaktigt svar från servern."
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
-#, fuzzy
-msgid "Connection to host could not be established"
-msgstr "Förbindelse med motpart kan inte etableras."
-
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Anslutning till värd kunde inte etableras: Timeout medan data skickades."
-
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Avahifel"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"Link-local-meddelanden kanske inte fungerar korrekt."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "Kontrollera om Avahi är installerat."
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr ""
+#~ "Anslutning till värd kunde inte etableras: Felaktigt svar från servern."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
 #, fuzzy
-msgid "Could not start local service"
-msgstr "Kunde inte ladda bild"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, fuzzy, python-format
-msgid "Unable to bind to port %d."
-msgstr "Lyckades inte gå med i rummet"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "Kontrollera om avahi-daemon körs."
-
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, fuzzy, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "Kunde inte ansluta till \"%s\""
-
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr ""
-"Du är inte ansluten eller visas inte för andra. Ditt meddelande kunde inte "
-"skickas."
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[Det här meddelandet är krypterat]"
-
-#: ../src/common/zeroconf/zeroconf.py:180
-#, fuzzy, python-format
-msgid "Error while adding service. %s"
-msgstr "problem vid sändning %s ( %s )"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "Förbindelse med motpart kan inte etableras."
 
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
@@ -6977,9 +10130,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "_Before time:"
 #~ msgstr "Före tid:"
 
-#~ msgid "_Publish"
-#~ msgstr "_Publicera"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Hämta"
 
@@ -6993,9 +10143,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Role: "
 #~ msgstr "Roll: "
 
-#~ msgid "Affiliation: "
-#~ msgstr "Anknytning: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -7032,9 +10179,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ogiltigt rum- eller servernamn"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "Okänd D-Busversion: %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr "publicering av vCard lyckades"
 
@@ -7058,15 +10202,9 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Send File"
 #~ msgstr "Skicka fil"
 
-#~ msgid "Underline"
-#~ msgstr "Understrykning"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Anslut till nytt _rum..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr "Användning: /%s, ställer om ett gruppchatfönster till kompaktvy."
-
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Vänligen välj ett av alternativen nedan:</b>"
@@ -7075,10 +10213,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgstr "Radera dagens meddelande"
 
 #, fuzzy
-#~ msgid "I want a notification popup:"
-#~ msgstr "Chattstatusmeddelanden:"
-
-#, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s vill skicka en fil till dig:"
 
@@ -7094,18 +10228,12 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "_XML Console..."
 #~ msgstr "_XML konsol..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "Välj avatar"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Använd kompaktvy när ett chattfönster öppnas"
 
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Använd kompaktvy när ett gruppchattfönster öppnas"
 
-#~ msgid "plain"
-#~ msgstr "enkel"
-
 #~ msgid "Send"
 #~ msgstr "Sänd"
 
@@ -7130,9 +10258,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Migrationen av logfiler till databasen lyckades."
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
-
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Starta Chatt med konto %s"
@@ -7155,9 +10280,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Read AUTHORS file for full list including past developers"
 #~ msgstr "Läs AUTHORS-filen för en komplett lista över tidigare utvecklare"
 
-#~ msgid "From %s"
-#~ msgstr "Från %s"
-
 #~ msgid "To %s"
 #~ msgstr "Till %s"
 
@@ -7236,9 +10358,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Åtminstone en kontaktgrupp måste finnas."
 
-#~ msgid "Image is too big"
-#~ msgstr "Bild är för stor"
-
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
@@ -7287,9 +10406,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Send Authorization to"
 #~ msgstr "Skicka auktorisering till"
 
-#~ msgid "<b>Log</b>"
-#~ msgstr "<b>Logg</b>"
-
 #~ msgid "Log presences in _contact's log file"
 #~ msgstr "Logga närvaro i _kontaktens logfil"
 
@@ -7320,9 +10436,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "_Latest"
 #~ msgstr "_Tidigaste"
 
-#~ msgid "_Previous"
-#~ msgstr "_Föregående"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s är nu %s: %s"
 
@@ -7350,12 +10463,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ "Du kan ställa in avancerade alternativ genom att använda \"Redigera-"
 #~ ">Konton\" från huvudfönstret."
 
-#~ msgid "Error:"
-#~ msgstr "Fel:"
-
-#~ msgid "Node"
-#~ msgstr "Nod"
-
 #~ msgid ""
 #~ "Your new account has been created and added to your gajim configuration.\n"
 #~ "You can set advanced account options using \"Edit->Accounts\" in the main "
@@ -7390,9 +10497,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Edit"
 #~ msgstr "Redigera"
 
-#~ msgid "<b>Please fill in the data for your existing account</b>"
-#~ msgstr "Fyll i informationen för ditt existerande konto"
-
 #~ msgid "Check if you want to register for a new jabber account"
 #~ msgstr "Kryssa i om du vill registrera ett nytt jabberkonto"
 
@@ -7451,9 +10555,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ "på kompaktvy med Alt+C. NOTIS: Statusen du lämnar ett fönster/en flik i "
 #~ "är inte permanent"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Anslut till _gruppchatt..."
-
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Visa registerfönstret när Gajim startar"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b897446a7..c10710568 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,12 +5,11 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 #
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
 "PO-Revision-Date: 2006-12-04 01:07+0800\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -34,44 +33,53 @@ msgid "Jabber IM Client"
 msgstr "Jabber 即时消息客户端"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "发送一条消息...(_M)"
+#: ../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
-msgid "_Discover Services..."
-msgstr "发掘服务(_D)..."
+#: ../data/glade/roster_window.glade.h:16
+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
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "群聊(_G)"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "修改帐户"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "修改帐户(_M)..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 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:24
+#, 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
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -84,53 +92,79 @@ msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>请选择一个选项</b>："
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
-msgid "<b>Please fill in the data for your new account</b>"
+#, 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
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr "点击查看 jabber 服务器特性(如 MSN, ICQ 代理)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "当我点击“结束”时连接"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim： 帐户创建向导"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#, fuzzy
+msgid "I already have an account I want to _use"
 msgstr "我已经拥有了一个帐户"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "我想注册一个新帐户(_R)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "如果选定，Gajim 会记录本帐户密码"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "密码(_W)"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:34
+msgid "Manage..."
+msgstr "管理..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+#, fuzzy
+msgid "Prox_y:"
+msgstr "代理服务器："
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "服务器设定"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "当连接上时设置我的模版"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "使用自定义主机名/端口号"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -138,67 +172,64 @@ msgstr ""
 "您需要一个帐户来连接\n"
 "Jabber 网络"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "您的 JID："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "主机(_H)："
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#, fuzzy
+msgid "_Hostname:"
+msgstr "主机名："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "端口(_P)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "重新键入密码：(_R)"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "使用代理服务器(_U)"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "用户名(_U)："
 
 #: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>杂项</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>个人信息</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Account"
 msgstr "账户"
 
@@ -207,19 +238,29 @@ msgid "Account Modification"
 msgstr "帐户修改"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "连接丢失后自动重新连接"
+#: ../data/glade/accounts_window.glade.h:7
+#, fuzzy
+msgid "Administration operations"
+msgstr "管理员列表"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "连接丢失后自动重新连接"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Gajim 启动时连接(_O)"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Chan_ge Password"
 msgstr "更换密码(_G)"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../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 "
@@ -229,57 +270,76 @@ msgstr ""
 "检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim 使"
 "用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "选择您的 OpenPGP 钥匙(_K)..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Click to change account's password"
 msgstr "点击变更帐户密码"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Connection"
 msgstr "连接"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "编辑个人信息..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
+#. 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:21
 #: ../data/glade/preferences_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
 msgid "General"
 msgstr "常规"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "主机名："
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../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 ""
 "如选定， Gajim 将广播除了你的 IP 外的更多 IP，文件传输将有较多机会可以工作。"
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:26
+#, fuzzy
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"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:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -287,14 +347,16 @@ msgid ""
 msgstr ""
 "如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -304,44 +366,49 @@ msgstr ""
 "如果选定，改变全局状态(在名单窗口下方复选框中调节)就会相应地改变当前帐户的状"
 "态"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:31
 msgid "Information about you, as stored in the server"
 msgstr "服务器中保存的关于您的信息"
 
-#: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "管理..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
 msgid "None"
 msgstr "无"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "端口："
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priori_ty:"
 msgstr "优先级(_T):"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:42
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -350,19 +417,23 @@ msgstr ""
 "优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依"
 "据。"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "优先级将根据您的状态自动转换。"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "代理服务器："
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:45
+#, fuzzy
+msgid "Resour_ce:"
 msgstr "资源(_C)："
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:46
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -374,89 +445,158 @@ msgstr ""
 "分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得"
 "到服务器的事件响应。"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "保存密文(_P)(不安全)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "发送防超时数据包"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/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:42
-msgid "Use custom hostname/port"
-msgstr "使用自定义主机名/端口号"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "使用文件传输代理服务器"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "调整状态(_A)"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+#, fuzzy
+msgid "_Name:"
 msgstr "名称(_N)："
 
-#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>属性</b>"
+
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Accounts"
 msgstr "帐户"
 
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:11
 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 be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"如果选择，所有使用群体兼容聊天客户端(如iChat，Trillian 或 Gaim)的本地联系人将"
-"在名单中显示。您将可使它工作而不用连接到 Jabber 服务器。\n"
-"只在 python-avahi 安装且 avahi 守护进程运行时有效。"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail ："
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "启用"
+
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+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
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"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 ""
-"如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们就"
-"像属于同一个帐户"
+"如果用于接受消息的默认端口不适合您的设置您可以在这里选择另外一个。\n"
+"您可以考虑下改变现在的防火墙设置。"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+msgid "Jabber ID:"
+msgstr "Jabber ID"
+
+#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "名："
+
+#: ../data/glade/accounts_window.glade.h:35
 msgid "Mer_ge accounts"
 msgstr "合并帐户(_G)"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "允许本地消息(_E)"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+msgid "Re_name"
+msgstr "重命名(_N)"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "修改(_M)"
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "使用自定义端口："
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "_Warn before using an insecure connection"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:62
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:63
+msgid "use HTTP_PROXY environment variable"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -475,8 +615,9 @@ msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人名单"
 
 #: ../data/glade/add_new_contact_window.glade.h:5
+#, fuzzy
 msgid ""
-"You have to register to this transport\n"
+"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."
@@ -515,7 +656,7 @@ msgstr "用户 ID(_U):"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
 #, fuzzy
-msgid "<b>An error has occured:</b>"
+msgid "<b>An error has occurred:</b>"
 msgstr "发生了一个协议错误："
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -554,11 +695,13 @@ 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
 msgid "<b>Description</b>"
 msgstr "<b>描述</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+#, 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
@@ -578,45 +721,46 @@ msgid "Deletes Message of the Day"
 msgstr "删除每日消息"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "发送消息至连接到当前服务器的用户"
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "私人列表(_P)"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "设定 MOTD"
+#, fuzzy
+msgid "Sends a message to users currently connected to this server"
+msgstr "发送消息至连接到当前服务器的用户"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "设定 MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "显示 XML 控制台(_X)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
 msgstr "更新 MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "管理员(_A)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "私人列表(_P)"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+#, fuzzy
+msgid "_Send Server Message..."
 msgstr "发送服务器消息(_S)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "发送单条消息(_S)"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr "与此联系人打开的窗口/标签"
@@ -630,7 +774,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>条件</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:15
 msgid "<b>Sounds</b>"
 msgstr "<b>声音</b>"
 
@@ -647,7 +791,7 @@ msgid "All statuses"
 msgstr "所有状态"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
 msgid "Away"
 msgstr "离开"
 
@@ -664,7 +808,7 @@ msgid "Have "
 msgstr "有"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:301
 msgid "Invisible"
 msgstr "隐身"
 
@@ -673,7 +817,7 @@ msgid "Launch a command"
 msgstr "启动命令"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:274
 msgid "Not Available"
 msgstr "不可用"
 
@@ -690,16 +834,16 @@ msgid "Play a sound"
 msgstr "播放声音"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
+#, fuzzy
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 "接受消息\n"
 "联系人在线\n"
@@ -711,56 +855,56 @@ msgstr ""
 "文件传输开始\n"
 "文件传输结束"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr "当"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "激活窗口管理器事件提示使任务栏的聊天窗口闪烁(_A)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
 msgstr "禁用自动打开聊天窗口(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
 msgstr "禁用现有的弹出窗口(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr "禁用现有的此事件的声音(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr "禁用在名单中显示事件(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr "禁用在系统托盘显示事件(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr "使用弹出窗口通知(_I)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Open chat window with user"
 msgstr "与用户打开聊天窗口(_O)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Show event in roster"
 msgstr "在名单中显示事件(_S)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
 msgstr "在系统托盘中显示事件(_S)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
 msgstr "与我"
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -770,54 +914,66 @@ msgstr ""
 "组\n"
 "任何人"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 msgid "for "
 msgstr "为"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr "当我在"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr ""
-
-#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Entry:"
 msgstr "国家："
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "主题名称"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "名："
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "当新事件发生时"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
+#: ../data/glade/blocked_contacts_window.glade.h:1
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "联系人"
+
+#: ../data/glade/change_activity_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b> "
+msgstr "<b>预设状态消息</b>"
+
+#: ../data/glade/change_activity_dialog.glade.h:2
+msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:9
-msgid "You have received new entry:"
+#: ../data/glade/change_activity_dialog.glade.h:3
+msgid "Set an activity"
 msgstr ""
 
+#: ../data/glade/change_mood_dialog.glade.h:1
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>预设状态消息</b>"
+
+#: ../data/glade/change_mood_dialog.glade.h:2
+#, fuzzy
+msgid "<b>Mood:</b>"
+msgstr "<b>声音</b>"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "更换密码"
@@ -847,10 +1003,9 @@ msgid "Join _Group Chat"
 msgstr "加入群聊(_G)"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#, fuzzy
+msgid "_Add to Roster..."
 msgstr "添加至名单(_A)"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -870,39 +1025,70 @@ msgid "_Open Link in Browser"
 msgstr "在浏览器中打开连接(_O)"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "点击查看与该联系人的历史对话"
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "联系人"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "发送文件(_F)"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "绑定 OpenPGP 加密 (_P)"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "绑定 OpenPGP 加密 (_P)"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "紧凑模式(_C)  Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "添加至名单(_A)"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:5805
 msgid "_History"
 msgstr "历史(_H)"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "邀请到(_V)"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "旁观者"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "填写表格。"
@@ -915,6 +1101,24 @@ msgstr "房间设置："
 msgid "Edit Groups"
 msgstr "编辑群组"
 
+#: ../data/glade/esession_info_window.glade.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>描述</b>"
+
+#: ../data/glade/esession_info_window.glade.h:2
+msgid "_Verify"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "服务器设定"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "文件发送、完成和中止的清单"
@@ -948,11 +1152,13 @@ msgid "Remove file transfer from the list."
 msgstr "从列表移除文件传输"
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+#, fuzzy
+msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "从列表移除已完成，已取消和失败的文件传输"
 
 #: ../data/glade/filetransfers.glade.h:10
-msgid "Shows a list of file transfers between you and other"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
 msgstr "显示文件传输列表"
 
 #: ../data/glade/filetransfers.glade.h:11
@@ -965,7 +1171,7 @@ msgstr "该操作会从列表中移除文件传输。如果该传输处于活动
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -973,7 +1179,7 @@ msgstr "继续(_C)"
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
 msgstr "打开文件夹(_O)"
 
@@ -1021,7 +1227,7 @@ msgstr "Gajim 主题自定义"
 msgid "Gone"
 msgstr "已离开"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "未活动的"
 
@@ -1062,58 +1268,72 @@ msgid "_Background:"
 msgstr "背景(_B)"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+#, fuzzy
+msgid "Change _Nickname..."
 msgstr "更换昵称(_N)"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+#, fuzzy
+msgid "Change _Subject..."
 msgstr "更换主题(_S)"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Click to see past conversation in this room"
-msgstr "点击查看本房间的历史对话"
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "设置房间(_R)"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "设置房间(_R)"
+#, fuzzy
+msgid "_Bookmark"
+msgstr "将本房间加入书签(_B)"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "将本房间加入书签(_B)"
+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
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "仲裁人(_D)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "房主动作(_O)"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "成员(_M)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "房主动作(_O)"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "拥有人(_O)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "发送私聊消息(_S)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "语音(_V)"
 
@@ -1122,22 +1342,19 @@ msgstr "语音(_V)"
 msgid "Create new post"
 msgstr "新发表"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
 msgid "From"
 msgstr "来自"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
+#: ../src/history_manager.py:202
 msgid "Subject"
 msgstr "主题"
 
 #: ../data/glade/history_manager.glade.h:1
+#, fuzzy
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<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."
@@ -1150,82 +1367,87 @@ 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:7
+#: ../data/glade/history_manager.glade.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim 历史记录管理器"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "删除"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "输出"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Gajim 历史记录管理器"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "搜索数据库(_S)"
 
-#: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "建立自定义查询"
-
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
 msgid "Conversation History"
 msgstr "对话历史"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "查询生成器..."
-
-#: ../data/glade/history_window.glade.h:4
-msgid "Search"
-msgstr "查找"
+#: ../data/glade/history_window.glade.h:2
+msgid ""
+"Enter JID or Contact name\n"
+"Groupchat Histories\n"
+"All Chat Histories"
+msgstr ""
 
 #: ../data/glade/history_window.glade.h:5
-msgid "_Search"
-msgstr "查找(_S)"
-
-#: ../data/glade/invitation_received_dialog.glade.h:1
-msgid "Accept"
-msgstr "接受"
-
-#: ../data/glade/invitation_received_dialog.glade.h:2
-#: ../data/glade/privacy_list_window.glade.h:8
-msgid "Deny"
-msgstr "拒绝"
+#, fuzzy
+msgid "Search:"
+msgstr "查找"
 
-#: ../data/glade/invitation_received_dialog.glade.h:3
-msgid "Invitation Received"
-msgstr "收到邀请"
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "记录聊天历史(_L)"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "昵称："
+#, fuzzy
+msgid "Join this room automatically when I connect"
+msgstr "当连接上时设置我的模版"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Nickname:"
+msgstr "昵称："
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "密码："
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "最近："
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -1245,18 +1467,37 @@ msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 msgid "Manage Bookmarks"
 msgstr "书签管理"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "打印状态："
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "服务器："
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "标题："
 
+#: ../data/glade/manage_pep_services_window.glade.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "房间设置："
+
+#: ../data/glade/manage_pep_services_window.glade.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
 msgid "<b>Properties</b>"
 msgstr "<b>属性</b>"
@@ -1266,46 +1507,85 @@ msgid "<b>Settings</b>"
 msgstr "<b>设置</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
 msgstr "HTTP 连接"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "代理服务器模板管理"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Name:"
 msgstr "名称："
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "密码(_W)"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "类型："
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "使用验证"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "主机(_H)："
+
 #: ../data/glade/message_window.glade.h:1
-msgid "Click to insert an emoticon (Alt+M)"
-msgstr "点这里插入表情符 (Alt+M)"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "向名单添加联系人"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP 加密"
+#: ../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 ""
 
-#. 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:4
-#: ../data/glade/roster_window.glade.h:10
-#: ../data/glade/subscription_request_window.glade.h:6
-msgid "_Actions"
-msgstr "动作(_A)"
+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)"
 
-#. 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: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
+msgid "Show a menu of advanced functions (Alt+A)"
+msgstr ""
+
+#: ../data/glade/message_window.glade.h:10
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:261
 msgid "_Send"
 msgstr "发送(_S)"
 
@@ -1321,40 +1601,77 @@ msgstr "<b>高级设置编辑器</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>应用</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>动作</b>"
+
 #: ../data/glade/preferences_window.glade.h:4
-msgid "<b>Custom</b>"
-msgstr "<b>自定义</b>"
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>编辑规则</b>"
 
 #: ../data/glade/preferences_window.glade.h:5
-msgid "<b>Format of a line</b>"
-msgstr "<b>行格式</b>"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>聊天标签颜色</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail 选项</b>"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>可视化提示</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</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
+msgid "<b>Custom</b>"
+msgstr "<b>自定义</b>"
 
 #: ../data/glade/preferences_window.glade.h:9
+#, fuzzy
+msgid "<b>Font</b>"
+msgstr "<b>声音</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail 选项</b>"
+
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>预设状态消息</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>私人列表</i>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:16
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>预设状态消息</b>"
+
+#: ../data/glade/preferences_window.glade.h:17
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>属性</b>"
+
+#: ../data/glade/preferences_window.glade.h:18
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>可视化提示</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
-msgid "A_fter nickname:"
-msgstr "在昵称后：(_F)"
-
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Advanced"
 msgstr "高级"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/glade/preferences_window.glade.h:20
+#, fuzzy
+msgid "Advanced..."
+msgstr "高级"
+
+#: ../data/glade/preferences_window.glade.h:21
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1364,45 +1681,25 @@ msgstr ""
 "仅在书写\n"
 "禁用"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
 msgstr "允许发送操作系统信息(_O)"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "允许提示，当我离开/不可用/忙/隐身"
 
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Also known as iChat style"
-msgstr "也就是 i 聊天风格"
-
-#: ../data/glade/preferences_window.glade.h:20
-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 will "
-"use the default one set here"
-msgstr ""
-"例如：当您允许离开的状态消息，当您改变状态至离开时 Gajim 将不再询问您状态消"
-"息；将会使用默认设置的消息"
-
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:26
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../data/glade/preferences_window.glade.h:22
-msgid "Auto _away after:"
-msgstr "自动离开(_A)："
-
-#: ../data/glade/preferences_window.glade.h:23
-msgid "Auto _not available after:"
-msgstr "自动不可用(_N)："
-
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:27
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "每次 Gajim 启动时自动探测\n"
@@ -1411,64 +1708,56 @@ msgstr ""
 "总是使用 XFCE4 默认应用\n"
 "自定义"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "B_efore nickname:"
-msgstr "在昵称前：(_E)"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "聊天"
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
+msgid "Chat message:"
+msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:31
-msgid ""
-"Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
-"当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
-"请谨慎使用。"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Configure color and font of the interface"
 msgstr "配置界面颜色与字体"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default Status Messages"
-msgstr "默认状态消息"
+#: ../data/glade/preferences_window.glade.h:35
+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 ""
 
-#: ../data/glade/preferences_window.glade.h:34
-msgid "Default status _iconset:"
-msgstr "默认状态图标设置:(_I)"
+#: ../data/glade/preferences_window.glade.h:40
+#, fuzzy
+msgid "Display _activity of contacts in roster"
+msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _extra email details"
 msgstr "显示扩展电子邮件详情(_E)"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:42
+#, fuzzy
+msgid "Display _tunes of contacts in roster"
+msgstr "显示名单中的联系人明细(_V)"
+
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:44
+#, fuzzy
+msgid "Display m_ood of contacts in roster"
+msgstr "显示名单中的联系人明细(_V)"
+
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid "Displayed Chat state noti_fications:"
-msgstr "显示聊天状态信息(_F)："
-
-#: ../data/glade/preferences_window.glade.h:39
-msgid "E_very 5 minutes"
-msgstr "每 5 分钟(_V)"
-
-#: ../data/glade/preferences_window.glade.h:40
-msgid "Emoticons:"
-msgstr "表情符："
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "Events"
-msgstr "事件"
-
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:46
 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 "
@@ -1477,7 +1766,7 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中"
 "显示的聊天状态。"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1486,146 +1775,185 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/glade/preferences_window.glade.h:44
-msgid ""
-"Gajim will automatically show new events by poping up the relative window"
-msgstr "Gajim 会自动弹出相关窗口以显示新的事件"
-
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr "Gajim 会通过屏幕右下方的弹出气泡提示新消息"
-
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚登录的联系人"
-
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 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:48
+#: ../data/glade/preferences_window.glade.h:50
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "在群聊窗口中隐藏按钮。"
+
+#: ../data/glade/preferences_window.glade.h:51
+#, fuzzy
 msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim 仅会改变触发了新事件的联系人图标"
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
+#, fuzzy
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:56
 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:53
+#: ../data/glade/preferences_window.glade.h:57
+#, fuzzy
 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 "如果选定，Gajim 会在下次运行时使用本次设定的名单及聊天窗口的位置和大小"
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
-msgstr ""
-"如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
-"图标方式显示，以表示在线，离开，忙，等等...)"
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
 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:56
-msgid "Ignore rich content in incoming messages"
-msgstr "忽略收到的消息中的扩展内容"
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:57
-msgid "Ma_nage..."
-msgstr "管理...(_N)"
+#: ../data/glade/preferences_window.glade.h:60
+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:58
+#: ../data/glade/preferences_window.glade.h:61
+#, fuzzy
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"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 ""
-"从不\n"
-"总是\n"
-"每一个帐号\n"
-"每种类型"
+"当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
+"请谨慎使用。"
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "提醒我关于联系人："
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "Notify on new _GMail email"
-msgstr "新 Gmail 邮件通知"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "对于每条消息(_M)"
+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/glade/preferences_window.glade.h:65
-msgid "One message _window:"
-msgstr "消息窗口：(_W)"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "Outgoing Chat state noti_fications:"
-msgstr "离开聊天状态指示(_F)："
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr "如果不禁用，Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Play _sounds"
-msgstr "播放声音(_S)"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:68
-msgid "Preferences"
-msgstr "参数"
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "消息窗口：(_W)"
 
 #: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "显示时间："
+msgid "Ma_nage..."
+msgstr "管理...(_N)"
 
 #: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr "保存名单和聊天窗口的位置及大小(_P)"
+#, fuzzy
+msgid "Notifications"
+msgstr "帐户修改"
 
 #: ../data/glade/preferences_window.glade.h:71
-msgid "Set status message to reflect currently playing _music track"
-msgstr "设置状态消息为当前播放的音轨(_M)"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "提醒我关于联系人："
 
 #: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "只显示名单中(_R)"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "提醒我关于联系人："
 
 #: ../data/glade/preferences_window.glade.h:73
+msgid "Notify on new _GMail email"
+msgstr "新 Gmail 邮件通知"
+
+#: ../data/glade/preferences_window.glade.h:74
+#, fuzzy
+msgid "Personal Events"
+msgstr "个人信息"
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "Play _sounds"
+msgstr "播放声音(_S)"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Preferences"
+msgstr "参数"
+
+#: ../data/glade/preferences_window.glade.h:80
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:81
 msgid "Sign _out"
 msgstr "退出登录(_O)"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:82
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1633,141 +1961,148 @@ msgstr ""
 "一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息"
 "内容。"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "按状态分类联系人(_S)"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
 msgid "Status"
 msgstr "状态"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:85
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "默认状态图标设置:(_I)"
+
+#: ../data/glade/preferences_window.glade.h:86
+#, fuzzy
+msgid "Style"
+msgstr "已冻结"
+
+#: ../data/glade/preferences_window.glade.h:87
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/glade/preferences_window.glade.h:78
-msgid "The auto away status message"
-msgstr "自动离开状态消息"
+#: ../data/glade/preferences_window.glade.h:88
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
-msgid "The auto not available status message"
-msgstr "自动不可用状态消息"
+#: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid "Use _transports iconsets"
+#: ../data/glade/preferences_window.glade.h:90
+#, fuzzy
+msgid "Use _transports icons"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Use system _default"
 msgstr "使用系统默认(_D)"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
-
-#: ../data/glade/preferences_window.glade.h:83
-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 "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"下列方式可用来提示您收到新的事件（消息，文件传输请求等）。请注意，只有未和您"
-"进行聊天的用户发送的新消息才会触发新消息事件"
-
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "When new event is received:"
 msgstr "当新事件发生时"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid ""
-"Works for Rhythmbox and Muine players. For more players, please visit http://"
-"trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr ""
-"为 Rhythmbox 和 Muine 播放器工作。 更多的播放器，请访问 http://trac.gajim."
-"org/wiki/GajimAndMusicPlayer。"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid "_Advanced Notifications Control..."
-msgstr "高级通知设置..."
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "_After time:"
-msgstr "在该时间后：(_A)"
-
-#: ../data/glade/preferences_window.glade.h:88
-msgid "_Before time:"
-msgstr "在该时间前：(_B)"
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
+msgid "_Away after:"
+msgstr "自动离开(_A)："
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:95
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "显示聊天状态信息(_F)："
+
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "表情符："
+
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:91
-msgid "_Font:"
-msgstr "字号：(_F)"
-
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "忽略收到的消息中的扩展内容"
+
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Incoming message:"
 msgstr "抵达的消息：(_I)"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "从不(_N)"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "提醒我(_N)"
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "_Not available after:"
+msgstr "自动不可用(_N)："
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Outgoing message:"
 msgstr "将要送出的消息：(_O)"
 
-#: ../data/glade/preferences_window.glade.h:101
-msgid "_Player:"
-msgstr "参与者(_P)"
-
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "弹出(_P)"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/glade/preferences_window.glade.h:104
-msgid "_Sort contacts by status"
-msgstr "按状态分类联系人(_S)"
+#: ../data/glade/preferences_window.glade.h:108
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:106
-msgid "_URL:"
-msgstr "URL：(_U)"
+#: ../data/glade/preferences_window.glade.h:110
+msgid "_URL highlight:"
+msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
+msgid "_Window behavior:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "加入群聊(_G)"
+
+#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "不在名单中"
+
+#: ../data/glade/preferences_window.glade.h:114
 msgid "minutes"
 msgstr "分钟"
 
@@ -1803,6 +2138,10 @@ msgstr "全部"
 msgid "Allow"
 msgstr "允许"
 
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "拒绝"
+
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
@@ -1811,7 +2150,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
 msgid "Privacy List"
 msgstr "私人列表"
 
@@ -1851,152 +2190,180 @@ msgstr "向我发送状态"
 msgid "to view my status"
 msgstr "查看我的状态"
 
-#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:1
+#: ../data/glade/vcard_information_window.glade.h:1
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>添加规则</b>"
+
 #: ../data/glade/profile_window.glade.h:2
-#: ../data/glade/vcard_information_window.glade.h:2
-msgid "About"
-msgstr "关于"
+#, fuzzy
+msgid "<b>Avatar:</b>"
+msgstr "明细："
 
 #: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:3
-msgid "Address"
-msgstr "地址"
+#: ../data/glade/vcard_information_window.glade.h:4
+#, fuzzy
+msgid "<b>Birthday:</b>"
+msgstr "生日"
 
 #: ../data/glade/profile_window.glade.h:4
-msgid "Avatar:"
-msgstr "明细："
+#: ../data/glade/vcard_information_window.glade.h:5
+#, fuzzy
+msgid "<b>City:</b>"
+msgstr "<b>自定义</b>"
 
 #: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:6
-msgid "Birthday:"
-msgstr "生日"
+#: ../data/glade/vcard_information_window.glade.h:7
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>自定义</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:7
-msgid "City:"
-msgstr "城市："
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Country:</b>"
+msgstr "<b>声音</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
-msgid "Company:"
-msgstr "公司："
-
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "国家："
-
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
+#: ../data/glade/vcard_information_window.glade.h:9
+#, fuzzy
+msgid "<b>Department:</b>"
 msgstr "部门："
 
-#: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+#, fuzzy
+msgid "<b>E-Mail:</b>"
 msgstr "E-Mail ："
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
-msgid "Extra Address:"
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "<b>Extra Address:</b>"
 msgstr "附加地址："
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
-msgid "Family:"
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:13
+#, fuzzy
+msgid "<b>Family:</b>"
 msgstr "家族："
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
-msgid "Format: YYYY-MM-DD"
-msgstr "格式： YYYY-MM-DD"
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:14
+#, fuzzy
+msgid "<b>Full Name</b>"
+msgstr "<b>自定义</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:22
-msgid "Given:"
-msgstr "教名："
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:16
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
-msgid "Homepage:"
+#: ../data/glade/profile_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:17
+#, fuzzy
+msgid "<b>Homepage:</b>"
 msgstr "主页："
 
 #. Middle Name
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:20
+#, fuzzy
+msgid "<b>Middle:</b>"
+msgstr "<b>添加规则</b>"
+
+#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:21
+#, fuzzy
+msgid "<b>Name:</b>"
+msgstr "<b>自定义</b>"
+
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "<b>Nickname:</b>"
+msgstr "昵称："
+
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
-msgid "Middle:"
-msgstr "中间："
+#: ../data/glade/vcard_information_window.glade.h:23
+#, fuzzy
+msgid "<b>Phone No.:</b>"
+msgstr "电话号码："
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "更多"
+#: ../data/glade/vcard_information_window.glade.h:24
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>条件</b>"
+
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:25
+#, fuzzy
+msgid "<b>Postal Code:</b>"
+msgstr "邮政编码："
 
+#. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
-msgid "Personal Info"
-msgstr "个人信息"
+#: ../data/glade/vcard_information_window.glade.h:27
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "<b>属性</b>"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>声音</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
-msgid "Phone No.:"
-msgstr "电话号码："
+#: ../data/glade/vcard_information_window.glade.h:30
+#, fuzzy
+msgid "<b>State:</b>"
+msgstr "<b>设置</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
-msgid "Position:"
-msgstr "位置："
-
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
-msgid "Postal Code:"
-msgstr "邮政编码："
+#: ../data/glade/vcard_information_window.glade.h:32
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>设置</b>"
 
-#. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:29
 #: ../data/glade/vcard_information_window.glade.h:36
-msgid "Prefix:"
-msgstr "前缀："
+#, 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:38 ../src/vcard.py:273
-msgid "Role:"
-msgstr "角色："
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "About"
+msgstr "关于"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
-msgid "State:"
-msgstr "州："
+msgid "Click to set your avatar"
+msgstr "单击以设置您的明细"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
-msgid "Street:"
-msgstr "街道："
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "格式： YYYY-MM-DD"
 
-#. Suffix in Name
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
-msgid "Suffix:"
-msgstr "后缀："
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "Personal Info"
+msgstr "个人信息"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "Work"
 msgstr "工作"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "发布(_P)"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "找回(_R)"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>想做什么？</b>"
@@ -2009,78 +2376,128 @@ msgstr "仅从 Gajim 移除帐户(_O)"
 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:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+msgid "_Remove"
+msgstr "移除(_R)"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "要求查看他/她的状态(_S)"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+#, fuzzy
+msgid "Add Special _Notification..."
 msgstr "添加特殊提示(_N)"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
 msgstr "指定 Open_PGP 密钥"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+#, fuzzy
+msgid "Edit _Groups..."
 msgstr "编辑群组"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:5695
 msgid "Execute Command..."
 msgstr "运行命令..."
 
+#. Invite to
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "发送单条消息(_M)"
+#, fuzzy
+msgid "Remo_ve"
+msgstr "移除(_R)"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "发送自定义 XML"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send Single _Message..."
+msgstr "发送一条消息...(_M)"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send _File..."
+msgstr "发送文件(_F)"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "开始群聊(_C)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
 msgstr "允许他/她查看我的状态(_A)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "禁止他/她查看我的状态(_F)"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "从名单中移除(_R)"
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "重命名联系人"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+#, fuzzy
+msgid "_Rename..."
 msgstr "重命名(_R)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "认证(_S)"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Unignore"
+msgstr "九"
+
 #: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "账户(_A)"
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "添加联系人(_A)..."
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "添加联系人(_C)"
+#, fuzzy
+msgid "Fea_tures"
+msgstr "服务器设定"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2094,51 +2511,91 @@ msgstr "被频繁提问的问题 (在线)"
 msgid "Help online"
 msgstr "在线帮助"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
 msgstr "模板，明细(V)"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:9
 msgid "Show Trans_ports"
 msgstr "显示代理(_P)"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
+#: ../data/glade/roster_window.glade.h:11
+#, fuzzy
+msgid "Show _roster"
+msgstr "显示名单(_R)"
+
 #: ../data/glade/roster_window.glade.h:12
-msgid "_Contents"
-msgstr "内容(_C)"
+#, fuzzy
+msgid "_Accounts"
+msgstr "帐户"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "发掘服务(_D)"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "动作(_A)"
 
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Contents"
+msgstr "内容(_C)"
+
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:18
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:23
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "发送一条消息...(_M)"
+
+#: ../data/glade/roster_window.glade.h:25
 msgid "_View"
 msgstr "视图(_V)"
 
+#: ../data/glade/search_window.glade.h:1
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "请等待日志被移动..."
+
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "查找"
+
+#: ../data/glade/search_window.glade.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "添加联系人(_C)"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#, fuzzy
+msgid "_Information"
+msgstr "联系人信息"
+
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+msgid "_Search"
+msgstr "查找(_S)"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "到(_O)"
@@ -2147,10 +2604,6 @@ msgstr "到(_O)"
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "过滤器(_F):"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "注册到"
@@ -2208,11 +2661,15 @@ msgid "Au_thorize"
 msgstr "授权(_V)"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
 msgstr "向联系人授权，使他知道您是否连接"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#, 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
@@ -2223,10 +2680,31 @@ msgstr "认证请求"
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr ""
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "您想聊天的 JID"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr ""
+
 #: ../data/glade/systray_context_menu.glade.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
 msgid "Show All Pending _Events"
 msgstr "显示所有未决事件"
@@ -2239,57 +2717,73 @@ msgstr "显示名单(_R)"
 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:5
-msgid "Ask:"
-msgstr "请求："
+#: ../data/glade/vcard_information_window.glade.h:3
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>动作</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
-msgid "Client:"
-msgstr "客户端："
+#: ../data/glade/vcard_information_window.glade.h:6
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "<b>自定义</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:18
+#, fuzzy
+msgid "<b>Jabber ID:</b>"
+msgstr "Jabber ID"
+
+#: ../data/glade/vcard_information_window.glade.h:28
+#, fuzzy
+msgid "<b>Resource:</b>"
+msgstr "资源："
+
+#: ../data/glade/vcard_information_window.glade.h:31
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>设置</b>"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:34
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>描述</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:37
+#, fuzzy
+msgid "<b>System:</b>"
+msgstr "<b>自定义</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "Comments"
 msgstr "注释"
 
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:41
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "设置房间(_R)"
+
+#: ../data/glade/vcard_information_window.glade.h:42
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "联系人"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:43
 msgid "Contact Information"
 msgstr "联系人信息"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID"
-
-#: ../data/glade/vcard_information_window.glade.h:30
-msgid "OS:"
-msgstr "操作系统："
-
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../data/glade/zeroconf_information_window.glade.h:8
-msgid "Resource:"
-msgstr "资源："
-
-#: ../data/glade/vcard_information_window.glade.h:40
-#: ../data/glade/zeroconf_information_window.glade.h:9
-msgid "Status:"
-msgstr "状态："
-
-#. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
-msgid "Subscription:"
-msgstr "认证："
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "More"
+msgstr "更多"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "记录聊天历史(_L)"
+#: ../data/glade/vcard_information_window.glade.h:48
+#, fuzzy
+msgid "User avatar:"
+msgstr "选择明细"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2299,11 +2793,6 @@ msgstr "<b>Jabber 通信</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML 输入</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "启用"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2322,15 +2811,29 @@ msgstr "消息(_M)"
 msgid "_Presence"
 msgstr "在场(_P)"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "姓："
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "添加特殊提示(_N)"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "名："
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "指定 Open_PGP 密钥"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:5596
+msgid "Edit _Groups"
+msgstr "编辑群组"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5722
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "修改帐户(_M)..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2340,237 +2843,2962 @@ msgstr "本地 JID："
 msgid "Personal"
 msgstr "个人"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"如果用于接受消息的默认端口不适合您的设置您可以在这里选择另外一个。\n"
-"您可以考虑下改变现在的防火墙设置。"
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "资源："
+
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "状态："
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "修改帐户"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "使用自定义端口："
+#: ../src/adhoc_commands.py:264
+#, fuzzy
+msgid "Cancel confirmation"
+msgstr "联系人信息"
+
+#: ../src/adhoc_commands.py:265
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+
+#: ../src/adhoc_commands.py:304
+msgid "Service changed the session identifier."
+msgstr ""
+
+#: ../src/adhoc_commands.py:317
+msgid "Service sent malformed data"
+msgstr ""
+
+#. when stanza doesn't have error description
+#: ../src/adhoc_commands.py:398
+msgid "Service returned an error."
+msgstr ""
 
-#: ../src/advanced.py:57
+#. For i18n
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Activated"
+msgstr "活动"
+
+#: ../src/advanced.py:97
+#, fuzzy
+msgid "Deactivated"
+msgstr "未活动的"
+
+#: ../src/advanced.py:99
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:100
+#, fuzzy
+msgid "Integer"
+msgstr "群组内"
+
+#: ../src/advanced.py:101
+msgid "Text"
+msgstr "文本"
+
+#: ../src/advanced.py:102
+msgid "Color"
+msgstr ""
+
+#: ../src/advanced.py:113
 msgid "Preference Name"
 msgstr "优先名称"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:119
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:127
 msgid "Type"
 msgstr "类型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:180
 msgid "(None)"
 msgstr "(无)"
 
-#. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:263
 msgid "Hidden"
 msgstr "隐藏"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Belarusian"
+msgstr "Bulgarian"
+
+#: ../src/chat_control.py:68
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "British"
+msgstr "Briton"
+
+#: ../src/chat_control.py:68
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Norwegian"
 msgstr "Norvegian"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
+#, fuzzy
+msgid "Serbian"
+msgstr "German"
+
+#: ../src/chat_control.py:68
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:68
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-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 export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"如果拼写检查不匹配您所使用用的语言，请正确设定您的 $LANG 。例如，中文用户就"
-"在 ~/.bash_profile 中键入 LANG=zh_CN 或 LANG=zh_CN.UTF-8 ，或在 /etc/profile "
-"中进行全局设定。\n"
-"\n"
-"拼写检查功能未启用"
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control.py:332
 msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:844
-msgid "Chats"
-msgstr "聊天"
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#, fuzzy
+msgid "GPG encryption enabled"
+msgstr "启用加密"
+
+#. Add to roster
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+msgid "Not in Roster"
+msgstr "不在名单中"
+
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+msgid "Unknown Source"
+msgstr ""
 
-#: ../src/chat_control.py:1030
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr "\"%(title)s\" %(artist)s"
+
+#: ../src/chat_control.py:1438
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
-#. we talk about a contact here
-#: ../src/chat_control.py:1118
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
+#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
+#, fuzzy
+msgid "GPG encryption disabled"
+msgstr "禁用加密"
+
+#: ../src/chat_control.py:1558
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#. encryption %s active
+#: ../src/chat_control.py:1574
+msgid "is"
+msgstr ""
+
+#: ../src/chat_control.py:1574
+msgid "is NOT"
+msgstr ""
+
+#. chat session %s be logged
+#: ../src/chat_control.py:1576
+msgid "will"
+msgstr ""
+
+#: ../src/chat_control.py:1576
+msgid "will NOT"
+msgstr ""
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1580
+#, fuzzy
+msgid "and authenticated"
+msgstr "使用验证"
+
+#. About encrypted chat session
+#: ../src/chat_control.py:1584
+#, fuzzy
+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:1590
 #, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
+msgid ""
+"%(type)s encryption %(status)s active %(authenticated)s.\n"
+"Your chat session %(logged)s be logged."
+msgstr ""
 
-#: ../src/chat_control.py:1254
-msgid "Encryption enabled"
-msgstr "启用加密"
+#: ../src/chat_control.py:1638
+msgid "Command not supported for zeroconf account."
+msgstr ""
+
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#, python-format
+msgid "Commands: %s"
+msgstr "命令： %s "
+
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "用法：/%s，清除文本窗口。"
+
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "用法：/%s，隐藏聊天按钮。"
+
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#, fuzzy, python-format
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
+
+#: ../src/chat_control.py:1663
+#, fuzzy, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
+
+#: ../src/chat_control.py:1666
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "用法：/%s，隐藏聊天按钮。"
+
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#, python-format
+msgid "No help info for /%s"
+msgstr "没有 /%s 的帮助信息"
+
+#: ../src/chat_control.py:1800
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[本条消息已加密]"
+
+#: ../src/chat_control.py:1810
+msgid " and WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1812
+msgid " and WILL NOT be logged"
+msgstr ""
 
-#: ../src/chat_control.py:1259
-msgid "Encryption disabled"
+#: ../src/chat_control.py:1817
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+
+#: ../src/chat_control.py:1819
+#, fuzzy
+msgid "E2E encryption disabled"
 msgstr "禁用加密"
 
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
-msgid "Not in Roster"
-msgstr "不在名单中"
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[本条消息已加密]"
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
+msgstr "[本条消息已加密]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1545
+#: ../src/chat_control.py:2225
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:2226
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/config.py:135 ../src/config.py:594
-msgid "Disabled"
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
+msgid "Database Error"
+msgstr ""
+
+#: ../src/chat_control.py:2377
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+
+#: ../src/chat_control.py:2608
+#, fuzzy, python-format
+msgid "%(name)s is now %(status)s"
+msgstr "%(nick)s 的状态是 %(status)s"
+
+#: ../src/common/check_paths.py:43
+msgid "creating logs database"
+msgstr "建立日志数据库"
+
+#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
+#: ../src/common/check_paths.py:128
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s 应为文件但它应为一个目录"
+
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+msgid "Gajim will now exit"
+msgstr "Gajim 即将退出"
+
+#: ../src/common/check_paths.py:136
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s 应为文件但它是一个目录"
+
+#: ../src/common/check_paths.py:152
+#, python-format
+msgid "creating %s directory"
+msgstr "正在建立 %s 目录"
+
+#: ../src/common/commands.py:80
+#, fuzzy
+msgid "Change status information"
+msgstr "联系人信息"
+
+#: ../src/common/commands.py:93
+#, fuzzy
+msgid "Change status"
+msgstr "联系人状态改变"
+
+#: ../src/common/commands.py:94
+msgid "Set the presence type and description"
+msgstr ""
+
+#: ../src/common/commands.py:100
+#, fuzzy
+msgid "Free for chat"
+msgstr "自由聊天"
+
+#: ../src/common/commands.py:101
+#, fuzzy
+msgid "Online"
+msgstr "九"
+
+#: ../src/common/commands.py:103
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:104
+#, fuzzy
+msgid "Do not disturb"
+msgstr "不分发。"
+
+#: ../src/common/commands.py:105
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:110
+#, fuzzy
+msgid "Presence description:"
+msgstr "描述"
+
+#: ../src/common/commands.py:145
+msgid "The status has been changed."
+msgstr ""
+
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "新群聊"
+
+#: ../src/common/commands.py:191
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "群聊 %(room_name)s 的 %(nickname)s"
+
+#: ../src/common/commands.py:195
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "%s 加入群聊"
+
+#: ../src/common/commands.py:202
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#. Make special context menu if group is Groupchats
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
+#, fuzzy
+msgid "Groupchats"
+msgstr "群聊"
+
+#: ../src/common/commands.py:247
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "您已经在群聊房间 %s 。"
+
+#: ../src/common/commands.py:259
+#, fuzzy
+msgid "Forward unread messages"
+msgstr " %d 条未读消息 "
+
+#: ../src/common/commands.py:279
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:82
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "使用 D-Bus 和通知进程显示通知"
+
+#: ../src/common/config.py:87
+msgid "Time in minutes, after which your status changes to away."
+msgstr "转换状态为“离开”之前的时间(分钟)。"
+
+#: ../src/common/config.py:88
+#, fuzzy
+msgid "$S (Away as a result of being idle more than $T min)"
+msgstr "发呆导致的离开"
+
+#: ../src/common/config.py:88
+msgid "$S will be replaced by current status message, $T by autoaway time."
+msgstr ""
+
+#: ../src/common/config.py:90
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "转换状态为“不可用”之前的时间(分钟)"
+
+#: ../src/common/config.py:91
+#, fuzzy
+msgid "$S (Not available as a result of being idle more than $T min)"
+msgstr "发呆导致的不可用"
+
+#: ../src/common/config.py:91
+msgid "$S will be replaced by current status message, $T by autoxa time."
+msgstr ""
+
+#: ../src/common/config.py:111
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr "折叠的列(账户和组)的列表(空格分隔)。"
+
+#. sorted alphanum
+#: ../src/common/config.py:112 ../src/common/config.py:448
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
+#, fuzzy
+msgid "default"
+msgstr "默认"
+
+#: ../src/common/config.py:116
+msgid "Enable link-local/zeroconf messaging"
+msgstr "允许本地连接/ ZeroConf 消息"
+
+#: ../src/common/config.py:119
+msgid "Language used by speller"
+msgstr "拼写检查的语言"
+
+#: ../src/common/config.py:120
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'一直' - 为每条消息打印时间。\n"
+"'有时' - 如 iChat 风格每隔几分钟打印时间。\n"
+"'从不' - 从不打印时间。"
+
+#: ../src/common/config.py:121
+#, fuzzy
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"使用模糊时钟打印时间。模糊度的值从 1 到 4，或者 0 禁用模糊时钟。1 是最精确的"
+"时钟，4 是最不精确的。只在打印时间为 '有时' 时生效。"
+
+#: ../src/common/config.py:124
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "如可能对 * / _ 格式化字串。"
+
+#: ../src/common/config.py:125
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
+
+#: ../src/common/config.py:128
+#, fuzzy
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"为 HTML 使用重构文本标记，如果选择加入 ASCII 格式。(如果您想使用此功能，请安"
+"装 docutils)"
+
+#: ../src/common/config.py:137
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "当在群聊中使用昵称补全时加到昵称后的字母"
+
+#: ../src/common/config.py:138
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr "当请求的昵称被群聊中的其他人使用时要加到被请求的昵称后的字母。"
+
+#: ../src/common/config.py:161
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:162
+msgid "Characters that are printed before the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:163
+msgid "Characters that are printed after the nickname in conversations"
+msgstr ""
+
+#: ../src/common/config.py:168
+msgid "Add * and [n] in roster title?"
+msgstr "加入 * 和 [n] 在名单标题？"
+
+#: ../src/common/config.py:169
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
+
+#: ../src/common/config.py:170
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "距上次谈话结束的分钟数"
+
+#: ../src/common/config.py:171
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
+
+#: ../src/common/config.py:173
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Ctrl+上箭头 存储行数。"
+
+#: ../src/common/config.py:176
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
+
+#: ../src/common/config.py:179
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
+
+#: ../src/common/config.py:180
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"如果为真，监听 NetworkManager 和状态改变(被没有监听网络管理器设置为假和它们使"
+"用全局状态同步提供)的基于网络连接的 D-Bus 信号。"
+
+#: ../src/common/config.py:181
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr "发送聊天状态通知。可以是全部，打字，禁用中的一个。"
+
+#: ../src/common/config.py:182
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr "在聊天窗口中显示聊天状态通知。可以是全部，打字，禁用中的一个。"
+
+#: ../src/common/config.py:184
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr "当不是每条消息打印时间(打印时间为有时)时，每几分钟打印它。"
+
+#: ../src/common/config.py:185
+msgid "Ask before closing a group chat tab/window."
+msgstr "关闭群聊标签/窗口前询问。"
+
+#: ../src/common/config.py:186
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前总是询问。"
+
+#: ../src/common/config.py:187
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前不再询问。"
+
+#: ../src/common/config.py:190
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
+
+#: ../src/common/config.py:192
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
+
+#: ../src/common/config.py:194
+msgid "Notify of events in the system trayicon."
+msgstr "在系统托盘图标通知事件。"
+
+#: ../src/common/config.py:200
+msgid "Show tab when only one conversation?"
+msgstr "只有一个会话时显示标签？"
+
+#: ../src/common/config.py:201
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "在聊天窗口中显示标签？"
+
+#: ../src/common/config.py:202
+msgid "Show close button in tab?"
+msgstr "在标签上显示关闭键？"
+
+#: ../src/common/config.py:203
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:204
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+
+#: ../src/common/config.py:213
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "聊天状态指示(_F)："
+
+#: ../src/common/config.py:218
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr "用分号隔开的群聊中将高亮显示的单词列表。"
+
+#: ../src/common/config.py:219
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
+"时才会生效。"
+
+#: ../src/common/config.py:220
+#, fuzzy
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
+
+#: ../src/common/config.py:221
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
+"是动态的。"
+
+#: ../src/common/config.py:222
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下"
+"方显示状态信息。"
+
+#: ../src/common/config.py:227
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr "如选是， Gajim 会为每一个缓存过久或上次未获得明细的联系人请求明细"
+
+#: ../src/common/config.py:229
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr "如选否，您将不再打印聊天中的联系人变更其状态和状态消息的状态行。"
+
+#: ../src/common/config.py:230
+#, fuzzy
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"可以是 \"无\"， \"全部\" 或 \"登入与登出\"。如果是 \"无\"，当成员改变他/她的"
+"状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印"
+"所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
+
+#: ../src/common/config.py:232
+msgid "Background color of contacts when they just signed in."
+msgstr "当联系人登入时的背景色。"
+
+#: ../src/common/config.py:233
+msgid "Background color of contacts when they just signed out."
+msgstr "当联系人登出时的背景色。"
+
+#: ../src/common/config.py:235
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr "如果为真，还原消息将用较小的字体。"
+
+#: ../src/common/config.py:236
+msgid "Don't show avatar for the transport itself."
+msgstr "不显示代理本身的明细。"
+
+#: ../src/common/config.py:237
+msgid "Don't show roster in the system taskbar."
+msgstr "不在系统任务栏显示名单。"
+
+#: ../src/common/config.py:238
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
+"理器的默认响应)"
+
+#: ../src/common/config.py:240
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"有人加入被密码保护的群聊时，Jabberd1.4 不需要 SHA 信息。将此选项置为“否”以停"
+"止在群聊中发送 SHA 信息。"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:243
+#, fuzzy
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
+"'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."
+msgstr ""
+"选择新消息在窗口中的位置。\n"
+"'总是' - 所有消息都发送到一个窗口。\n"
+"'从不' - 所有消息都打开单独的窗口。\n"
+"'每一个帐号' - 每个帐号的消息都发送到一个单独的窗口。\n"
+"'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
+"注意，改变该选项后必须重启 Gajim 使设置生效。"
+
+#: ../src/common/config.py:244
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "如选否，您将不会在窗口中看到明细。"
+
+#: ../src/common/config.py:245
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "如选是，按 Escape 键关闭标签/窗口。"
+
+#: ../src/common/config.py:246
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "在群聊窗口中隐藏按钮。"
+
+#: ../src/common/config.py:247
+msgid "Hides the banner in a group chat window"
+msgstr "在群聊窗口中隐藏标语"
+
+#: ../src/common/config.py:248
+msgid "Hides the banner in two persons chat window"
+msgstr "在双人聊天窗口中隐藏标语"
+
+#: ../src/common/config.py:249
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "在群聊窗口中隐藏房主列表。"
+
+#: ../src/common/config.py:250
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr "在聊天中，只在当前一条消息不是同一人发出的的时候在一行前显示昵称。"
+
+#: ../src/common/config.py:251
+#, fuzzy
+msgid "Indentation when using merge consecutive nickname."
+msgstr "当合并连续昵称时缩进。"
+
+#: ../src/common/config.py:252
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "发送消息并关闭窗口"
+
+#: ../src/common/config.py:253
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr "将会在群聊中使用彩色昵称的颜色列表。"
+
+#: ../src/common/config.py:254
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "当没有新消息时按 Ctrl-Tab 转到下一个撰写标签。"
+
+#: ../src/common/config.py:255
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
+
+#: ../src/common/config.py:256
+#, fuzzy
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"如果为真，您将可以在修改账户窗口中为您的账户可以设置一个否定优先级。注意！当"
+"您使用否定优先级登入时您将从服务器收不到任何消息。"
+
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+
+#: ../src/common/config.py:259
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+
+#: ../src/common/config.py:260
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:261
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:262
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:263
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+
+#: ../src/common/config.py:266
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+
+#: ../src/common/config.py:267
+msgid ""
+"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
+"\" uri."
+msgstr ""
+
+#: ../src/common/config.py:278
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
+
+#: ../src/common/config.py:286
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+
+#: ../src/common/config.py:287
+msgid "If enabled, restore the last status that was used."
+msgstr ""
+
+#: ../src/common/config.py:292
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+
+#: ../src/common/config.py:294
+msgid "Enable ESessions encryption for this account."
+msgstr ""
+
+#: ../src/common/config.py:295
+msgid "Should Gajim automatically start an encrypted session when possible?"
+msgstr ""
+
+#: ../src/common/config.py:296
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+
+#: ../src/common/config.py:297
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: ../src/common/config.py:300
+msgid "Space separated list of ssl errors to ignore."
+msgstr ""
+
+#: ../src/common/config.py:312
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+
+#. yes, no, ask
+#: ../src/common/config.py:316
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 工作区"
+
+#: ../src/common/config.py:320
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
+"置(_P)"
+
+#: ../src/common/config.py:334
+msgid "Answer to receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:335
+msgid "Sent receipt requests"
+msgstr ""
+
+#: ../src/common/config.py:389
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "是否为此联系人使用 OpenPGP?"
+
+#: ../src/common/config.py:390
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+
+#: ../src/common/config.py:391 ../src/common/config.py:394
+msgid "Language for which we want to check misspelled words"
+msgstr "想要检查拼写的语言"
+
+#: ../src/common/config.py:400
+msgid "all or space separated status"
+msgstr "全部或空格分隔的状态"
+
+#: ../src/common/config.py:401
+msgid "'yes', 'no', or 'both'"
+msgstr "'是'，'否'或'两者'"
+
+#: ../src/common/config.py:402 ../src/common/config.py:404
+#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:409
+msgid "'yes', 'no' or ''"
+msgstr "'是'，'否'或''"
+
+#: ../src/common/config.py:415 ../src/common/pep.py:159
+msgid "Sleeping"
+msgstr "正在睡觉"
+
+#: ../src/common/config.py:416
+msgid "Back soon"
+msgstr "马上回来"
+
+#: ../src/common/config.py:416
+msgid "Back in some minutes."
+msgstr "很快回来"
+
+#: ../src/common/config.py:417 ../src/common/pep.py:129
+msgid "Eating"
+msgstr "吃饭"
+
+#: ../src/common/config.py:417
+msgid "I'm eating, so leave me a message."
+msgstr "正在吃饭，请留言"
+
+#: ../src/common/config.py:418
+msgid "Movie"
+msgstr "电影"
+
+#: ../src/common/config.py:418
+msgid "I'm watching a movie."
+msgstr "正在看电影"
+
+#: ../src/common/config.py:419 ../src/common/pep.py:188
+msgid "Working"
+msgstr "工作"
+
+#: ../src/common/config.py:419
+msgid "I'm working."
+msgstr "工作中"
+
+#: ../src/common/config.py:420
+msgid "Phone"
+msgstr "电话"
+
+#: ../src/common/config.py:420
+msgid "I'm on the phone."
+msgstr "我在打电话"
+
+#: ../src/common/config.py:421
+msgid "Out"
+msgstr "外出"
+
+#: ../src/common/config.py:421
+msgid "I'm out enjoying life."
+msgstr "我正在享受户外生活。"
+
+#: ../src/common/config.py:425
+msgid "I'm available."
+msgstr "我现在在线。"
+
+#: ../src/common/config.py:426
+msgid "I'm free for chat."
+msgstr "自由聊天。"
+
+#: ../src/common/config.py:427 ../src/config.py:1397
+msgid "Be right back."
+msgstr "很快回来。"
+
+#: ../src/common/config.py:428
+msgid "I'm not available."
+msgstr "我现在不可用。"
+
+#: ../src/common/config.py:429
+msgid "Do not disturb."
+msgstr "不分发。"
+
+#: ../src/common/config.py:430 ../src/common/config.py:431
+msgid "Bye!"
+msgstr "再见！"
+
+#: ../src/common/config.py:441
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
+
+#: ../src/common/config.py:442
+msgid "Sound to play when any MUC message arrives."
+msgstr "当 MUC 信息到达时的声音"
+
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
+msgid "green"
+msgstr "绿色"
+
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
+msgid "grocery"
+msgstr "杂货店"
+
+#: ../src/common/config.py:459
+msgid "human"
+msgstr "人类"
+
+#: ../src/common/config.py:463
+msgid "marine"
+msgstr "海洋"
+
+#: ../src/common/connection_handlers.py:71
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+msgid "Unable to load idle module"
+msgstr "无法加载发呆模块"
+
+#: ../src/common/connection_handlers.py:233
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+msgid "Wrong host"
+msgstr "错误主机"
+
+#: ../src/common/connection_handlers.py:234
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:639
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "代理 %s 所需的注册信息未按时抵达"
+
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
+#: ../src/gajim.py:392
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "不支持扩展"
+
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1978
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "昵称不允许： %s "
+
+#. we are banned
+#. group chat does not exist
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+msgid "Unable to join group chat"
+msgstr "无法加入群聊"
+
+#: ../src/common/connection_handlers.py:2054
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "您被该群聊封禁。"
+
+#: ../src/common/connection_handlers.py:2057
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "不存在这样的群聊"
+
+#: ../src/common/connection_handlers.py:2060
+msgid "Group chat creation is restricted."
+msgstr "群聊创建受限。"
+
+#: ../src/common/connection_handlers.py:2063
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "您注册的昵称已被使用"
+
+#: ../src/common/connection_handlers.py:2067
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "您不在成员名单中。"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:2109
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "授权被移除"
+
+#: ../src/common/connection_handlers.py:2116
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2143
+msgid "I would like to add you to my roster."
+msgstr "我申请添加您到联系人名单"
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:2164
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr " %s 请求认证"
+
+#: ../src/common/connection_handlers.py:2166
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr " %s 请求解除认证"
+
+#: ../src/common/connection_handlers.py:2168
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "%s 解除了认证"
+
+#: ../src/common/connection_handlers.py:2343
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
+"单管理工具移除。"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2368
+#: ../src/common/zeroconf/connection_zeroconf.py:172
+msgid "OpenPGP passphrase was not given"
+msgstr "未获得 OpenPGP 密文"
+
+#. %s is the account name here
+#: ../src/common/connection_handlers.py:2370
+#: ../src/common/zeroconf/connection_zeroconf.py:174
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
+#: ../src/common/connection.py:66
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:67
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:70
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "无法加载发呆模块"
+
+#: ../src/common/connection.py:71
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:73
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "CRL has expired"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:80
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:81
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Self signed certificate"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:84
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:85
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:88
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "无效用户名"
+
+#: ../src/common/connection.py:89
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:94
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:95
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:96
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:97
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "帐户“%s”的连接丢失"
+
+#: ../src/common/connection.py:267
+msgid "Reconnect manually."
+msgstr "手动重连。"
+
+#: ../src/common/connection.py:278
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "服务代理 %s 对注册请求响应错误：%s"
+
+#: ../src/common/connection.py:312
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:325
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "未知的 D-Bus 版本： %s"
+
+#. wrong answer
+#: ../src/common/connection.py:340
+msgid "Invalid answer"
+msgstr "无效答案"
+
+#: ../src/common/connection.py:341
+#, fuzzy, python-format
+msgid "Transport %(name)s answered wrongly to register request: %(error)s"
+msgstr "服务代理 %s 对注册请求响应错误：%s"
+
+#: ../src/common/connection.py:522
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "连接失败"
+
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "尚未连接到“%s”"
+
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
+msgid "Check your connection or try again later."
+msgstr "检查连接并稍后重试。"
+
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "尚未连接到“%s”"
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "帐户“%s”的连接丢失"
+
+#: ../src/common/connection.py:666
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:669
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: ../src/common/connection.py:671
+#, fuzzy, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr "未知的 D-Bus 版本： %s"
+
+#: ../src/common/connection.py:712
+msgid "Check your connection or try again later"
+msgstr "检查连接并稍后重试"
+
+#: ../src/common/connection.py:737
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "“%s”登录验证失败"
+
+#: ../src/common/connection.py:739
+msgid "Please check your login and password for correctness."
+msgstr "请检查登录信息和密码的正确性"
+
+#: ../src/common/connection.py:800
+#, fuzzy
+msgid "Error while removing privacy list"
+msgstr "添加服务错误。 %s"
+
+#: ../src/common/connection.py:801
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+
+#: ../src/common/connection.py:1094
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:1096
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:1105
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
+
+#: ../src/common/connection.py:1217
+#: ../src/common/zeroconf/connection_zeroconf.py:445
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"主题：%s\n"
+"%s"
+
+#: ../src/common/connection.py:1395
+msgid "Not fetched because of invisible status"
+msgstr "由于隐身状态不获取"
+
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+msgid "Observers"
+msgstr "旁观者"
+
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+msgid "Transports"
+msgstr "代理"
+
+#: ../src/common/contacts.py:356
+#, fuzzy
+msgid "Not in roster"
+msgstr "不在名单中"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:47
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "本机缺少 D-Bus python 绑定"
+
+#: ../src/common/dbus_support.py:48
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajim 的 D-Bus 兼容性无法使用"
+
+#: ../src/common/exceptions.py:30
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
+
+#: ../src/common/exceptions.py:47
+#, fuzzy
+msgid "Database cannot be read."
+msgstr "账户名不能为空。"
+
+#: ../src/common/exceptions.py:55
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr "服务不可用：Gajim不在运行，或远程控制错误"
+
+#: ../src/common/exceptions.py:63
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
+
+#: ../src/common/exceptions.py:71
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"会话进程不可用。\n"
+"您可以参考 http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "一"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "二"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "三"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "四"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "五"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "六"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "七"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "八"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "九"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "十"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "十一"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "十二"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "$0 o'clock"
+msgstr "%0 点钟"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#, fuzzy
+msgid "five past $0"
+msgstr "五过 %0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "ten past $0"
+msgstr "十过 %0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#, fuzzy
+msgid "quarter past $0"
+msgstr "四分之一过 %0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty past $0"
+msgstr "二十过 %0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#, fuzzy
+msgid "twenty five past $0"
+msgstr "二十五过 %0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "half past $0"
+msgstr "半过 %0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#, fuzzy
+msgid "twenty five to $1"
+msgstr "二十五到 %1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "twenty to $1"
+msgstr "二十到 %1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#, fuzzy
+msgid "quarter to $1"
+msgstr "四分之一到 %1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "ten to $1"
+msgstr "十到 %1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#, fuzzy
+msgid "five to $1"
+msgstr "五到 %1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#, fuzzy
+msgid "$1 o'clock"
+msgstr "%1 点"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "夜晚"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "清晨"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "早晨"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "晌午"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "中午"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "下午"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "晚上"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "傍晚"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "一周开始"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "一周中"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "一周末"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "周末"
+
+#: ../src/common/helpers.py:158
+msgid "Invalid character in username."
+msgstr "无效的用户名特征。"
+
+#: ../src/common/helpers.py:163
+msgid "Server address required."
+msgstr "此处需要服务器地址"
+
+#: ../src/common/helpers.py:169
+msgid "Invalid character in hostname."
+msgstr "无效的主机名特征。"
+
+#: ../src/common/helpers.py:176
+msgid "Invalid character in resource."
+msgstr "无效的资源特征。"
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:216
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:219
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:223
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:226
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:230
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:233
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:236
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:267
+msgid "_Busy"
+msgstr "忙碌(_B)"
+
+#: ../src/common/helpers.py:269
+msgid "Busy"
+msgstr "忙碌"
+
+#: ../src/common/helpers.py:272
+msgid "_Not Available"
+msgstr "不可用(_N)"
+
+#: ../src/common/helpers.py:277
+msgid "_Free for Chat"
+msgstr "自由聊天(_F)"
+
+#: ../src/common/helpers.py:279
+msgid "Free for Chat"
+msgstr "自由聊天"
+
+#: ../src/common/helpers.py:282
+msgid "_Available"
+msgstr "在线(_A)"
+
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
+msgid "Available"
+msgstr "在线"
+
+#: ../src/common/helpers.py:286
+msgid "Connecting"
+msgstr "正在连接"
+
+#: ../src/common/helpers.py:289
+msgid "A_way"
+msgstr "离开(_A)"
+
+#: ../src/common/helpers.py:294
+msgid "_Offline"
+msgstr "离线(_O)"
+
+#: ../src/common/helpers.py:296
+msgid "Offline"
+msgstr "离线"
+
+#: ../src/common/helpers.py:299
+msgid "_Invisible"
+msgstr "隐身(_I)"
+
+#: ../src/common/helpers.py:305
+msgid "?contact has status:Unknown"
+msgstr "?contact has status: 未知"
+
+#: ../src/common/helpers.py:307
+msgid "?contact has status:Has errors"
+msgstr "?contact has status: 有错误"
+
+#: ../src/common/helpers.py:312
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have: 无"
+
+#: ../src/common/helpers.py:314
+msgid "To"
+msgstr "到"
+
+#: ../src/common/helpers.py:318
+msgid "Both"
+msgstr "双方"
+
+#: ../src/common/helpers.py:326
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription): 无"
+
+#: ../src/common/helpers.py:328
+msgid "Subscribe"
+msgstr "认证"
+
+#: ../src/common/helpers.py:337
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role: 无"
+
+#: ../src/common/helpers.py:340
+msgid "Moderators"
+msgstr "主持人"
+
+#: ../src/common/helpers.py:342
+msgid "Moderator"
+msgstr "主持人"
+
+#: ../src/common/helpers.py:345
+msgid "Participants"
+msgstr "参与者"
+
+#: ../src/common/helpers.py:347
+msgid "Participant"
+msgstr "参与者"
+
+#: ../src/common/helpers.py:350
+msgid "Visitors"
+msgstr "访客"
+
+#: ../src/common/helpers.py:352
+msgid "Visitor"
+msgstr "访客"
+
+#: ../src/common/helpers.py:358
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation: 无"
+
+#: ../src/common/helpers.py:360
+msgid "Owner"
+msgstr "所有者"
+
+#: ../src/common/helpers.py:362
+msgid "Administrator"
+msgstr "管理员"
+
+#: ../src/common/helpers.py:364
+msgid "Member"
+msgstr "成员"
+
+#: ../src/common/helpers.py:401
+msgid "is paying attention to the conversation"
+msgstr "正在专注于聊天"
+
+#: ../src/common/helpers.py:403
+msgid "is doing something else"
+msgstr "在做其他事"
+
+#: ../src/common/helpers.py:405
+msgid "is composing a message..."
+msgstr "正在输入消息..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:408
+msgid "paused composing a message"
+msgstr "中断输入消息"
+
+#: ../src/common/helpers.py:410
+msgid "has closed the chat window or tab"
+msgstr "关闭了聊天窗口或标签"
+
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "发送消息"
+
+#: ../src/common/helpers.py:1005
+#, fuzzy, python-format
+msgid " from room %s"
+msgstr "来自 %s"
+
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#, fuzzy, python-format
+msgid " from user %s"
+msgstr "来自 %s"
+
+#: ../src/common/helpers.py:1010
+#, fuzzy, python-format
+msgid " from %s"
+msgstr "来自 %s"
+
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+
+#: ../src/common/helpers.py:1057
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:56
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "错误：无法按读打开文件 %s"
+
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+msgid "cyan"
+msgstr "青色"
+
+#: ../src/common/optparser.py:341
+#, fuzzy
+msgid "migrating logs database to indices"
+msgstr "合并日志数据库"
+
+#: ../src/common/passwords.py:92
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim 帐户 %s"
+
+#: ../src/common/pep.py:29
+msgid "Afraid"
+msgstr ""
+
+#: ../src/common/pep.py:30
+msgid "Amazed"
+msgstr ""
+
+#: ../src/common/pep.py:31
+msgid "Amorous"
+msgstr ""
+
+#: ../src/common/pep.py:32
+msgid "Angry"
+msgstr ""
+
+#: ../src/common/pep.py:33
+msgid "Annoyed"
+msgstr ""
+
+#: ../src/common/pep.py:34
+msgid "Anxious"
+msgstr ""
+
+#: ../src/common/pep.py:35
+#, fuzzy
+msgid "Aroused"
+msgstr "已暂停"
+
+#: ../src/common/pep.py:36
+msgid "Ashamed"
+msgstr ""
+
+#: ../src/common/pep.py:37
+#, fuzzy
+msgid "Bored"
+msgstr "粗体"
+
+#: ../src/common/pep.py:38
+#, fuzzy
+msgid "Brave"
+msgstr "有"
+
+#: ../src/common/pep.py:39
+msgid "Calm"
+msgstr ""
+
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "聊天"
+
+#: ../src/common/pep.py:41
+#, fuzzy
+msgid "Cold"
+msgstr "粗体"
+
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "内容(_C)"
+
+#: ../src/common/pep.py:43
+msgid "Confused"
+msgstr ""
+
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "已完成"
+
+#: ../src/common/pep.py:45
+#, fuzzy
+msgid "Contented"
+msgstr "内容(_C)"
+
+#: ../src/common/pep.py:46
+msgid "Cranky"
+msgstr ""
+
+#: ../src/common/pep.py:47
+msgid "Crazy"
+msgstr ""
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "未活动的"
+
+#: ../src/common/pep.py:49
+msgid "Curious"
+msgstr ""
+
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "删除"
+
+#: ../src/common/pep.py:51
+msgid "Depressed"
+msgstr ""
+
+#: ../src/common/pep.py:52
+#, fuzzy
+msgid "Disappointed"
+msgstr "禁用"
+
+#: ../src/common/pep.py:53
+msgid "Disgusted"
+msgstr ""
+
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "禁用"
+
+#: ../src/common/pep.py:55
+#, fuzzy
+msgid "Distracted"
 msgstr "禁用"
 
-#: ../src/config.py:221
+#: ../src/common/pep.py:56
+msgid "Embarrassed"
+msgstr ""
+
+#: ../src/common/pep.py:57
+msgid "Envious"
+msgstr ""
+
+#: ../src/common/pep.py:58
+msgid "Excited"
+msgstr ""
+
+#: ../src/common/pep.py:59
+msgid "Flirtatious"
+msgstr ""
+
+#: ../src/common/pep.py:60
+msgid "Frustrated"
+msgstr ""
+
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+msgid "Grieving"
+msgstr ""
+
+#: ../src/common/pep.py:63
+#, fuzzy
+msgid "Grumpy"
+msgstr "群组"
+
+#: ../src/common/pep.py:64
+msgid "Guilty"
+msgstr ""
+
+#: ../src/common/pep.py:65
+msgid "Happy"
+msgstr ""
+
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
+#, fuzzy
+msgid "Hot"
+msgstr "主机(_H)："
+
+#: ../src/common/pep.py:68
+msgid "Humbled"
+msgstr ""
+
+#: ../src/common/pep.py:69
+msgid "Humiliated"
+msgstr ""
+
+#: ../src/common/pep.py:70
+msgid "Hungry"
+msgstr ""
+
+#: ../src/common/pep.py:71
+msgid "Hurt"
+msgstr ""
+
+#: ../src/common/pep.py:72
+#, fuzzy
+msgid "Impressed"
+msgstr "消息"
+
+#: ../src/common/pep.py:73
+msgid "In Awe"
+msgstr ""
+
+#: ../src/common/pep.py:74
+msgid "In Love"
+msgstr ""
+
+#: ../src/common/pep.py:75
+msgid "Indignant"
+msgstr ""
+
+#: ../src/common/pep.py:76
+msgid "Interested"
+msgstr ""
+
+#: ../src/common/pep.py:77
+msgid "Intoxicated"
+msgstr ""
+
+#: ../src/common/pep.py:78
+#, fuzzy
+msgid "Invincible"
+msgstr "隐身"
+
+#: ../src/common/pep.py:79
+msgid "Jealous"
+msgstr ""
+
+#: ../src/common/pep.py:80
+#, fuzzy
+msgid "Lonely"
+msgstr "一"
+
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "主机(_H)："
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#: ../src/common/pep.py:84
+#, fuzzy
+msgid "Moody"
+msgstr "修改(_M)"
+
+#: ../src/common/pep.py:85
+msgid "Nervous"
+msgstr ""
+
+#: ../src/common/pep.py:86
+msgid "Neutral"
+msgstr ""
+
+#: ../src/common/pep.py:87
+#, fuzzy
+msgid "Offended"
+msgstr "离线"
+
+#: ../src/common/pep.py:88
+msgid "Outraged"
+msgstr ""
+
+#: ../src/common/pep.py:89
+msgid "Playful"
+msgstr ""
+
+#: ../src/common/pep.py:90
+#, fuzzy
+msgid "Proud"
+msgstr "群组"
+
+#: ../src/common/pep.py:91
+msgid "Relaxed"
+msgstr ""
+
+#: ../src/common/pep.py:92
+#, fuzzy
+msgid "Relieved"
+msgstr "十一"
+
+#: ../src/common/pep.py:93
+msgid "Remorseful"
+msgstr ""
+
+#: ../src/common/pep.py:94
+msgid "Restless"
+msgstr ""
+
+#: ../src/common/pep.py:95
+#, fuzzy
+msgid "Sad"
+msgstr "已冻结"
+
+#: ../src/common/pep.py:96
+msgid "Sarcastic"
+msgstr ""
+
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "名："
+
+#: ../src/common/pep.py:98
+msgid "Serious"
+msgstr ""
+
+#: ../src/common/pep.py:99
+msgid "Shocked"
+msgstr ""
+
+#: ../src/common/pep.py:100
+msgid "Shy"
+msgstr ""
+
+#: ../src/common/pep.py:101
+#, fuzzy
+msgid "Sick"
+msgstr "昵称"
+
+#: ../src/common/pep.py:102
+#, fuzzy
+msgid "Sleepy"
+msgstr "正在睡觉"
+
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
+#, fuzzy
+msgid "Stressed"
+msgstr "街道："
+
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
+#, fuzzy
+msgid "Surprised"
+msgstr "订阅"
+
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
+msgid "Thirsty"
+msgstr ""
+
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "时间"
+
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "下划线"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
+msgid "Worried"
+msgstr ""
+
+#: ../src/common/pep.py:115
+#, fuzzy
+msgid "Doing Chores"
+msgstr "错误主机"
+
+#: ../src/common/pep.py:116
+msgid "Buying Groceries"
+msgstr ""
+
+#: ../src/common/pep.py:117
+#, fuzzy
+msgid "Cleaning"
+msgstr "晚上"
+
+#: ../src/common/pep.py:118
+#, fuzzy
+msgid "Cooking"
+msgstr "正在编写"
+
+#: ../src/common/pep.py:119
+msgid "Doing Maintenance"
+msgstr ""
+
+#: ../src/common/pep.py:120
+msgid "Doing the Dishes"
+msgstr ""
+
+#: ../src/common/pep.py:121
+msgid "Doing the Laundry"
+msgstr ""
+
+#: ../src/common/pep.py:122
+#, fuzzy
+msgid "Gardening"
+msgstr "早晨"
+
+#: ../src/common/pep.py:123
+msgid "Running an Errand"
+msgstr ""
+
+#: ../src/common/pep.py:124
+#, fuzzy
+msgid "Walking the Dog"
+msgstr "群组内所有"
+
+#: ../src/common/pep.py:125
+#, fuzzy
+msgid "Drinking"
+msgstr "工作"
+
+#: ../src/common/pep.py:126
+msgid "Having a Beer"
+msgstr ""
+
+#: ../src/common/pep.py:127
+msgid "Having Coffee"
+msgstr ""
+
+#: ../src/common/pep.py:128
+msgid "Having Tea"
+msgstr ""
+
+#: ../src/common/pep.py:130
+msgid "Having a Snack"
+msgstr ""
+
+#: ../src/common/pep.py:131
+msgid "Having Breakfast"
+msgstr ""
+
+#: ../src/common/pep.py:132
+msgid "Having Dinner"
+msgstr ""
+
+#: ../src/common/pep.py:133
+msgid "Having Lunch"
+msgstr ""
+
+#: ../src/common/pep.py:134
+msgid "Exercising"
+msgstr ""
+
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
+msgid "Cycling"
+msgstr ""
+
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "晚上"
+
+#: ../src/common/pep.py:137
+#, fuzzy
+msgid "Hiking"
+msgstr "踢出 %s"
+
+#: ../src/common/pep.py:138
+#, fuzzy
+msgid "Jogging"
+msgstr "加入(_J)"
+
+#: ../src/common/pep.py:139
+msgid "Playing Sports"
+msgstr ""
+
+#: ../src/common/pep.py:140
+msgid "Running"
+msgstr ""
+
+#: ../src/common/pep.py:141
+#, fuzzy
+msgid "Skiing"
+msgstr "工作"
+
+#: ../src/common/pep.py:142
+msgid "Swimming"
+msgstr ""
+
+#: ../src/common/pep.py:143
+#, fuzzy
+msgid "Working out"
+msgstr "工作"
+
+#: ../src/common/pep.py:144
+msgid "Grooming"
+msgstr ""
+
+#: ../src/common/pep.py:145
+msgid "At the Spa"
+msgstr ""
+
+#: ../src/common/pep.py:146
+msgid "Brushing Teeth"
+msgstr ""
+
+#: ../src/common/pep.py:147
+msgid "Getting a Haircut"
+msgstr ""
+
+#: ../src/common/pep.py:148
+#, fuzzy
+msgid "Shaving"
+msgstr "吃饭"
+
+#: ../src/common/pep.py:149
+msgid "Taking a Bath"
+msgstr ""
+
+#: ../src/common/pep.py:150
+msgid "Taking a Shower"
+msgstr ""
+
+#: ../src/common/pep.py:151
+msgid "Having an Appointment"
+msgstr ""
+
+#: ../src/common/pep.py:153
+msgid "Day Off"
+msgstr ""
+
+#: ../src/common/pep.py:154
+#, fuzzy
+msgid "Hanging out"
+msgstr "正在更换话题"
+
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "踢出 %s"
+
+#: ../src/common/pep.py:156
+msgid "On Vacation"
+msgstr ""
+
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "吃饭"
+
+#: ../src/common/pep.py:158
+msgid "Scheduled Holiday"
+msgstr ""
+
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "工作"
+
+#: ../src/common/pep.py:161
+#, fuzzy
+msgid "Relaxing"
+msgstr "高原"
+
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "踢出 %s"
+
+#: ../src/common/pep.py:163
+#, fuzzy
+msgid "Gaming"
+msgstr "吃饭"
+
+#: ../src/common/pep.py:164
+#, fuzzy
+msgid "Going out"
+msgstr "退出登录(_O)"
+
+#: ../src/common/pep.py:165
+#, fuzzy
+msgid "Partying"
+msgstr "吃饭"
+
+#: ../src/common/pep.py:166
+#, fuzzy
+msgid "Reading"
+msgstr "原因"
+
+#: ../src/common/pep.py:167
+#, fuzzy
+msgid "Rehearsing"
+msgstr "原因"
+
+#: ../src/common/pep.py:168
+#, fuzzy
+msgid "Shopping"
+msgstr "正在睡觉"
+
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "工作"
+
+#: ../src/common/pep.py:170
+msgid "Socializing"
+msgstr ""
+
+#: ../src/common/pep.py:171
+#, fuzzy
+msgid "Sunbathing"
+msgstr "吃饭"
+
+#: ../src/common/pep.py:172
+msgid "Watching TV"
+msgstr ""
+
+#: ../src/common/pep.py:173
+#, fuzzy
+msgid "Watching a Movie"
+msgstr "正在看电影"
+
+#: ../src/common/pep.py:174
+#, fuzzy
+msgid "Talking"
+msgstr "吃饭"
+
+#: ../src/common/pep.py:175
+msgid "In Real Life"
+msgstr ""
+
+#: ../src/common/pep.py:176
+#, fuzzy
+msgid "On the Phone"
+msgstr "我在打电话"
+
+#: ../src/common/pep.py:177
+msgid "On Video Phone"
+msgstr ""
+
+#: ../src/common/pep.py:178
+#, fuzzy
+msgid "Traveling"
+msgstr "传输中"
+
+#: ../src/common/pep.py:179
+#, fuzzy
+msgid "Commuting"
+msgstr "正在编写"
+
+#: ../src/common/pep.py:181
+msgid "Driving"
+msgstr ""
+
+#: ../src/common/pep.py:182
+msgid "In a Car"
+msgstr ""
+
+#: ../src/common/pep.py:183
+msgid "On a Bus"
+msgstr ""
+
+#: ../src/common/pep.py:184
+msgid "On a Plane"
+msgstr ""
+
+#: ../src/common/pep.py:185
+#, fuzzy
+msgid "On a Train"
+msgstr "作为链接打开(_L)："
+
+#: ../src/common/pep.py:186
+msgid "On a Trip"
+msgstr ""
+
+#: ../src/common/pep.py:187
+#, fuzzy
+msgid "Walking"
+msgstr "工作"
+
+#: ../src/common/pep.py:189
+#, fuzzy
+msgid "Coding"
+msgstr "正在编写"
+
+#: ../src/common/pep.py:190
+msgid "In a Meeting"
+msgstr ""
+
+#: ../src/common/pep.py:191
+msgid "Studying"
+msgstr ""
+
+#: ../src/common/pep.py:192
+#, fuzzy
+msgid "Writing"
+msgstr "工作"
+
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "无法绑定端口%s。"
+
+#: ../src/common/socks5.py:85
+#, fuzzy
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
+
+#. we're not english
+#: ../src/common/stanza_session.py:278
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+
+#: ../src/common/zeroconf/client_zeroconf.py:408
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "到主机的连接无法建立：发送数据超时。"
+
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr "您需要重新连接才能继续收发消息。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Avahi error"
+msgstr "Avahi 错误"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 #, python-format
-msgid "Every %s _minutes"
-msgstr "每 %s 分钟(m)"
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"本地消息将无法正常工作。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:249
+#, fuzzy
+msgid "Please check if Avahi or Bonjour is installed."
+msgstr "请检查 Avahi 是否已经安装。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:262
+msgid "Could not start local service"
+msgstr "无法启动本地服务"
 
-#: ../src/config.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "无法绑定端口 %d。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:358
+msgid "Please check if avahi-daemon is running."
+msgstr "请检查 avahi-daemon 是否运行。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:357
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "无法改变账户“%s”的状态"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:374
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr "没有连接或隐身。您的消息将不会被发送。"
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:391
+msgid "[This message is encrypted]"
+msgstr "[本条消息已加密]"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:457
+#, fuzzy
+msgid "Your message could not be sent."
+msgstr "联系人离线。您的消息将不被发送。"
+
+#. Contact Offline
+#: ../src/common/zeroconf/connection_zeroconf.py:464
+msgid "Contact is offline. Your message could not be sent."
+msgstr "联系人离线。您的消息将不被发送。"
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "添加服务错误。 %s"
+
+#: ../src/config.py:150 ../src/config.py:582
+msgid "Disabled"
+msgstr "禁用"
+
+#: ../src/config.py:321
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:371
+#: ../src/config.py:329
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:405
+#, fuzzy
+msgid "Default Message"
+msgstr "默认状态消息"
+
+#: ../src/config.py:412
+#, fuzzy
+msgid "Enabled"
+msgstr "启用"
+
+#: ../src/config.py:454
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:455
+#, fuzzy
+msgid "Custom"
+msgstr "<b>自定义</b>"
+
+#: ../src/config.py:650 ../src/dialogs.py:1209
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:651
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2578,241 +5806,249 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1016
 msgid "status message text"
 msgstr "状态消息文本"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1053
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:1074
-msgid "Next Message Received"
+#: ../src/config.py:1054
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "收到的下一条消息"
+
+#: ../src/config.py:1056
+#, fuzzy
+msgid "Next Message Received Unfocused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1057
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1058
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1059
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1060
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1061
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:1086
+#: ../src/config.py:1062
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
+msgid "Name"
+msgstr "名称"
+
+#: ../src/config.py:1405
+msgid "Relogin now?"
+msgstr "现在重新登录？"
+
+#: ../src/config.py:1406
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "如果想使所有调整立即生效，您必须重新登录。"
+
+#: ../src/config.py:1531 ../src/config.py:1630
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1666 ../src/config.py:1709
+msgid "Unread events"
+msgstr "未读取的事件"
+
+#: ../src/config.py:1667
+msgid "Read all pending events before removing this account."
+msgstr "移除帐号前请阅读所有未决事件。"
+
+#: ../src/config.py:1693
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "您已在账户 %s 打开聊天"
+
+#: ../src/config.py:1694
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
+
+#: ../src/config.py:1705
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1706
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr "未读取的事件"
-
-#: ../src/config.py:1340
+#: ../src/config.py:1710
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1716
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1717
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1721 ../src/config.py:1725
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1722
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1726
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1800
+#, fuzzy
+msgid "Rename Account"
+msgstr "帐户管理"
+
+#: ../src/config.py:1801
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "为群组 %s 输入新的名称"
+
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1828
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:1428
+#: ../src/config.py:2018 ../src/config.py:3161
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:1429
+#: ../src/config.py:2019 ../src/config.py:3162
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr "很快回来。"
+#: ../src/config.py:2040
+msgid "Failed to get secret keys"
+msgstr "获取密钥失败"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr "现在重新登录？"
+#: ../src/config.py:2041
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:1566
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "如果想使所有调整立即生效，您必须重新登录。"
+#: ../src/config.py:2076
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2077
+msgid "Choose your OpenPGP key"
+msgstr "选择您的 OpenPGP 钥匙"
+
+#: ../src/config.py:2088
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2089
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2097
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:1605
+#: ../src/config.py:2101
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:1606
+#: ../src/config.py:2102
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "获取密钥失败"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "在取回 OpenPGP 密钥时发生错误。"
-
-#: ../src/config.py:1634 ../src/config.py:3427
-msgid "OpenPGP Key Selection"
-msgstr "OpenPGP 密钥选择"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "选择您的 OpenPGP 钥匙"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "名称"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "服务器"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr "移除帐号前请阅读所有未决事件。"
-
-#: ../src/config.py:1969
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "您已在账户 %s 打开聊天"
-
-#: ../src/config.py:1970
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
-
-#: ../src/config.py:2029
+#: ../src/config.py:2133
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2030
+#: ../src/config.py:2134
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2262
+#: ../src/config.py:2317
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2319
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2355
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2356
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2357
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2358
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2415
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2420
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2424
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2449
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2451
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2820,11 +6056,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2453
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2454
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2832,23 +6068,24 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2456
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2418
+#: ../src/config.py:2457
+#, fuzzy
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2459
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2421
+#: ../src/config.py:2460
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2856,7 +6093,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2461
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2872,839 +6109,1326 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2527
+#: ../src/config.py:2558
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2581 ../src/roster_window.py:1917
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2582 ../src/roster_window.py:1944
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2591
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2592
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2688
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2689
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2690
+#, fuzzy
+msgid "?print_status:None"
+msgstr "?print_status:全部"
+
+#: ../src/config.py:2758
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2791
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2749
+#: ../src/config.py:2792
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:3011
+#: ../src/config.py:3072
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3074
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "无效密码"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "必须为新账户输入密码。"
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "密码不符"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "两次密码输入不一致。"
-
-#: ../src/config.py:3047
+#: ../src/config.py:3100
 msgid "Duplicate Jabber ID"
 msgstr "复制 Jabber ID"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3101
 msgid "This account is already configured in Gajim."
 msgstr "此帐号已在 Gajim 中配置过。"
 
-#: ../src/config.py:3065
+#: ../src/config.py:3118
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3119 ../src/config.py:3308
+#, fuzzy
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3100
-msgid "Your new account has been created successfully"
-msgstr "注册新账户成功"
+#: ../src/config.py:3137
+#, fuzzy
+msgid "Invalid server"
+msgstr "无效用户名"
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3138
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "请指定您想使用的新昵称："
+
+#: ../src/config.py:3189 ../src/gajim.py:1993
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "联系人已经在名单中"
+
+#: ../src/config.py:3190 ../src/gajim.py:1994
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: ../src/config.py:3258
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3264 ../src/gajim.py:2017
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../src/config.py:3287 ../src/config.py:3326
+#, fuzzy
+msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3307
+msgid "Your new account has been created successfully"
+msgstr "注册新账户成功"
+
+#: ../src/config.py:3410
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3411
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:549
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#: ../src/conversation_textview.py:568
+#, fuzzy
 msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:678
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:690
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:695
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:712
 #, 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:388
+#: ../src/conversation_textview.py:725
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:728
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:734
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/conversation_textview.py:1238
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1242
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1276
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:540
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber 即时消息客户端"
+
+#: ../src/dataforms_widget.py:541
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:552
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:75
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID： <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:187
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:194
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:279
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:284
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:461
+#, fuzzy
+msgid "Set Mood"
+msgstr "设定 MOTD"
+
+#: ../src/dialogs.py:558
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:560
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:672
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "状态消息"
+
+#: ../src/dialogs.py:673
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
+
+#: ../src/dialogs.py:682
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:683
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:689
 msgid "AIM Address:"
 msgstr "AIM 地址："
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:690
 msgid "GG Number:"
 msgstr "GG 号码："
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:691
 msgid "ICQ Number:"
 msgstr "ICQ 号码："
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:692
 msgid "MSN Address:"
 msgstr "MSN 地址："
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:693
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址："
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:729
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:731
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:895
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:900
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "我申请添加您到联系人名单"
+
+#: ../src/dialogs.py:914
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:915
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:951
 msgid "User ID:"
 msgstr "用户 ID："
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:1009
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:1010
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本："
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:1011
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本："
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:1021
 msgid "Current Developers:"
 msgstr "当前的开发者："
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:1023
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:1029
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:1035
 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:776
+#: ../src/dialogs.py:1048
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>"
 
-#: ../src/dialogs.py:906
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "无法绑定端口%s。"
-
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1210
+#, fuzzy, python-format
 msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
-msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/dialogs.py:1058
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../src/dialogs.py:1614
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1617
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1686
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1705
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1776
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "无效用户名"
+
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "群聊 Jabber ID 包含非法字符。"
+
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:1225
+#: ../src/dialogs.py:1794
 msgid "This is not a group chat"
 msgstr "这不是一个群聊"
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1795
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是群聊的名称。"
 
-#: ../src/dialogs.py:1248
+#: ../src/dialogs.py:1822
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "连接后才可更改密码。"
+
+#: ../src/dialogs.py:1836
+msgid "Server"
+msgstr "服务器"
+
+#: ../src/dialogs.py:1869
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "账户 “%s” 已连接到服务器"
+
+#: ../src/dialogs.py:1870
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "请在加入群聊前先连接到服务器。"
+
+#: ../src/dialogs.py:1894
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1952
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1954
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1955
 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:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1992
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:2001
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:2020
+msgid "Invalid password"
+msgstr "无效密码"
+
+#: ../src/dialogs.py:2020
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
+#: ../src/dialogs.py:2024
+msgid "Passwords do not match"
+msgstr "密码不符"
+
+#: ../src/dialogs.py:2025
+msgid "The passwords typed in both fields must be identical."
+msgstr "两次密码输入不一致。"
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
+#: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
+#: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
+#: ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
+#: ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
+#: ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
+#: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
+#: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
+#: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
+#: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
+#: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#, 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:1667
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2442
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2444
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2568
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "私人列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:1887
-#, python-format
-msgid "Order: %s, action: %s, type: %s, value: %s"
+#: ../src/dialogs.py:2628
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序：%s，动作：%s，类型：%s，值：%s"
 
-#: ../src/dialogs.py:1890
-#, python-format
-msgid "Order: %s, action: %s"
+#: ../src/dialogs.py:2633
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序： %s，动作：%s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2675
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2762
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2858
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2860
 msgid "Privacy Lists"
 msgstr "私人列表"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2930
 msgid "Invalid List Name"
 msgstr "无效列表名"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2931
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个私人列表。"
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
-#, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+#: ../src/dialogs.py:2963
+#, fuzzy
+msgid "You are invited to a groupchat"
+msgstr "您被该群聊封禁。"
+
+#: ../src/dialogs.py:2966
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
+
+#: ../src/dialogs.py:2968
+#, fuzzy, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2976
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2978
+msgid "Do you want to accept the invitation?"
+msgstr ""
+
+#: ../src/dialogs.py:3033
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:3048
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:3081
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:3099
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:3164
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:3166
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:3237
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:3243
 msgid "Condition"
 msgstr "条件"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3361
 msgid "when I am "
 msgstr "当我"
 
-#: ../src/disco.py:101
+#: ../src/dialogs.py:3836
+#, python-format
+msgid ""
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3840
+msgid "You have already verified this contact's identity."
+msgstr ""
+
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+msgid "Contact's identity verified"
+msgstr ""
+
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+msgid "Contact's identity NOT verified"
+msgstr ""
+
+#: ../src/dialogs.py:3869
+msgid "Verify..."
+msgstr ""
+
+#: ../src/dialogs.py:3881
+msgid "Have you verified the contact's identity?"
+msgstr ""
+
+#: ../src/dialogs.py:3882
+#, 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"
+"\n"
+"This session's Short Authentication String is <b>%(sas)s</b>."
+msgstr ""
+
+#: ../src/dialogs.py:3883
+msgid "Did you talk to the remote contact and verify the SAS?"
+msgstr ""
+
+#: ../src/dialogs.py:3915
+#, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr ""
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
 msgid "Others"
 msgstr "其他"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
-msgid "Transports"
-msgstr "代理"
-
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:120
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:656
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:657
 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:647 ../src/disco.py:928
+#: ../src/disco.py:661 ../src/disco.py:955
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:662
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:728
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "无效用户名"
+
+#: ../src/disco.py:754
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:794
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:956
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1179
+#, fuzzy
+msgid "_Execute Command"
+msgstr "执行命令(_E)..."
+
+#: ../src/disco.py:1189 ../src/disco.py:1353
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1295
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../src/disco.py:1390
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1572
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1580
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1588
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1826
+#, fuzzy
+msgid "Node"
+msgstr "无"
+
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:51
+msgid "PyOpenSSL"
+msgstr ""
+
+#: ../src/features_window.py:52
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+
+#: ../src/features_window.py:53 ../src/features_window.py:54
+msgid "Requires python-pyopenssl."
+msgstr ""
+
+#: ../src/features_window.py:55
+msgid "Bonjour / Zeroconf"
+msgstr ""
+
+#: ../src/features_window.py:56
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+
+#: ../src/features_window.py:57
+msgid "Requires python-avahi."
+msgstr ""
+
+#: ../src/features_window.py:58
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+
+#: ../src/features_window.py:59
+msgid "gajim-remote"
+msgstr ""
+
+#: ../src/features_window.py:60
+msgid "A script to control Gajim via commandline."
+msgstr ""
+
+#: ../src/features_window.py:61
+msgid "Requires python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:62 ../src/features_window.py:66
+#: ../src/features_window.py:70 ../src/features_window.py:74
+#: ../src/features_window.py:78 ../src/features_window.py:86
+#: ../src/features_window.py:90
+msgid "Feature not available under Windows."
+msgstr ""
+
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:64
+msgid "Encrypting chatmessages with gpg keys."
+msgstr ""
+
+#: ../src/features_window.py:65
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr ""
+
+#: ../src/features_window.py:67
+#, fuzzy
+msgid "network-manager"
+msgstr "历史管理器"
+
+#: ../src/features_window.py:68
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:69
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:71
+#, fuzzy
+msgid "Session Management"
+msgstr "消息已发送"
+
+#: ../src/features_window.py:72
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+
+#: ../src/features_window.py:73
+msgid "Requires python-gnome2."
+msgstr ""
+
+#: ../src/features_window.py:75
+msgid "gnome-keyring"
+msgstr ""
+
+#: ../src/features_window.py:76
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "SRV"
+msgstr ""
+
+#: ../src/features_window.py:80
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:81
+msgid "Requires dnsutils."
+msgstr ""
+
+#: ../src/features_window.py:82
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:83
+msgid "Spell Checker"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Spellchecking of composed messages."
+msgstr ""
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:88
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:91
+msgid "Trayicon"
+msgstr ""
+
+#: ../src/features_window.py:92
+msgid "A icon in systemtray reflecting the current presence."
+msgstr ""
+
+#: ../src/features_window.py:93
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:94
+msgid "Requires PyGTK >= 2.10."
+msgstr ""
+
+#: ../src/features_window.py:95
+#, fuzzy
+msgid "Idle"
+msgstr "Id"
+
+#: ../src/features_window.py:96
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:97 ../src/features_window.py:98
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "LaTeX"
+msgstr ""
+
+#: ../src/features_window.py:100
+msgid "Transform LaTeX expressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "End to End Encryption"
+msgstr "OpenPGP 加密"
+
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "抵达的消息：(_I)"
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:107
+#, fuzzy
+msgid "RST Generator"
+msgstr "常规"
+
+#: ../src/features_window.py:108
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-docutils."
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr ""
+
+#: ../src/features_window.py:113 ../src/features_window.py:114
+msgid "Requires python-sexy."
+msgstr ""
+
+#: ../src/features_window.py:128
+#, fuzzy
+msgid "Feature"
+msgstr "服务器设定"
+
+#: ../src/filetransfers_window.py:76
 msgid "File"
 msgstr "文件"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:91
 msgid "Time"
 msgstr "时间"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:103
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名： %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, 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:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:499
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在： %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#, fuzzy
+msgid "File transfer cancelled"
 msgstr "文件传输已取消"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:228
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:230
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息：%s"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:231
+#, fuzzy
+msgid "File transfer stopped by the contact at the other end"
 msgstr "文件传输被对方中止"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#, fuzzy
+msgid "Description: "
+msgstr "描述： %s"
+
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "File: %s"
 msgstr "文件： %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "文件名已经存在且您没有权限覆盖它。"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
 msgid "What do you want to do?"
 msgstr "想做什么？"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "另存为..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3712,80 +7436,90 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "文件："
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "发送者："
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../src/gajim.py:83
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:156
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
 msgstr "运行 Gajim 需要 X 服务器。退出..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
+#: ../src/gajim.py:189
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../src/gajim.py:190
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:195
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:199
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:204
 msgid "Gajim needs PySQLite2 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:212
 msgid "Gajim needs pywin32 to run"
 msgstr "运行 Gajim 需要 pywin32"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:213
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3793,11 +7527,11 @@ msgid ""
 msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:366
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:367
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3805,227 +7539,455 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行 \n"
 "运行？"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) 授权给 %s (id: %s)"
+#: ../src/gajim.py:493
+msgid "Passphrase Required"
+msgstr "要求密文"
+
+#: ../src/gajim.py:494
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "为账户 %s 输入 GPG 密文字段"
+
+#. ask again
+#: ../src/gajim.py:509
+msgid "Wrong Passphrase"
+msgstr "错误字段"
+
+#: ../src/gajim.py:510
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "请重新输入您的 GPG 字段或点“取消”"
+
+#: ../src/gajim.py:557
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"您申请的昵称正在使用或被其他人占有。\n"
+"从下列昵称中另外指定一个："
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:571
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:573
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "是否接受这个请求？"
+
+#: ../src/gajim.py:576
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) 授权给 %s (id: %s)"
+
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gajim.py:706
-#, python-format
-msgid "Subject: %s"
-msgstr "主题：%s"
+#: ../src/gajim.py:930 ../src/gajim.py:934
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s： %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
-#, python-format
-msgid "error while sending %s ( %s )"
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gajim.py:944 ../src/gajim.py:957
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:989
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:990
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:1009
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:807
-msgid "You will always see him or her as offline."
-msgstr "您将一直看到他/她的状态为离线。"
+#: ../src/gajim.py:1010
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:1051
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
-msgid "Check your connection or try again later."
-msgstr "检查连接并稍后重试。"
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s 现在成了 %s"
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
 #, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s 正在 %s (%s)."
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "您的密文不正确"
+#: ../src/gajim.py:1305
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#: ../src/gajim.py:1372
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1374
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1377
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gajim.py:1380
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1382
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1384
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1387
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1390
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1422
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "该群聊要求密码才能加入。"
+
+#: ../src/gajim.py:1456
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gajim.py:1458
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1461
+msgid "Your passphrase is incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gajim.py:1561
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1563
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1576
 #, python-format
 msgid ""
 "\n"
-"From: %(from_address)s"
-msgstr ""
 "\n"
-"从：%(from_address)s"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1647
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1715
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1719
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1732
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1736
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1820
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gajim.py:1827
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "对于每条消息(_M)"
+
+#: ../src/gajim.py:1898
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:1899
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
+#: ../src/gajim.py:1911
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1924
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1935
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1960
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "用户名冲突"
+
+#: ../src/gajim.py:1961
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gajim.py:2014
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2015
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2020
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gajim.py:2035
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2036
+#, python-format
+msgid ""
+"It seems the SSL certificate has changed or your connection is being "
+"hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
+#, fuzzy
+msgid "Insecure connection"
+msgstr "连接"
+
+#: ../src/gajim.py:2059
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "您在创建一个元联系人。确定继续？"
+
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
+msgid "Do _not ask me again"
+msgstr "不再提问此问题(_N)"
+
+#: ../src/gajim.py:2089
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gajim.py:2106
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gajim.py:2107
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "禁用加密"
+
+#: ../src/gajim.py:2573
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gajim.py:2594
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
+msgid "You cannot join a group chat while you are invisible"
+msgstr "隐身时无法加入群聊"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2900
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gajim.py:2090
-msgid "Network Manager support not available"
-msgstr "网络管理支持不可用"
+#: ../src/gajim.py:2997
+msgid "Bookmark already set"
+msgstr "书签已设定"
 
-#: ../src/gajim.py:2165
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
+#: ../src/gajim.py:2998
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "群聊“%s”已在您的书签中。"
+
+#: ../src/gajim.py:3011
+msgid "Bookmark has been added successfully"
+msgstr "书签添加成功"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim.py:3012
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "您可以通过“动作”菜单管理您的名单。"
+
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:78
-msgid "Popups a window with the next pending event"
+#: ../src/gajim-remote.py:91
+#, fuzzy
+msgid "Pops up a window with the next pending event"
 msgstr "为下一条未读消息弹出窗口"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:95
+#, fuzzy
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
 msgid "account"
 msgstr "账户"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "status"
 msgstr "状态"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:111
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
 msgid "message"
 msgstr "消息"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:121
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:128
 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 "
@@ -4034,27 +7996,29 @@ msgstr ""
 "发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:141
 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 "
@@ -4063,135 +8027,210 @@ msgstr ""
 "发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:146
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:155
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:157
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "联系人的JID将收到消息"
+
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:170
 msgid "Gets detailed info on a account"
 msgstr "获得帐号的详细信息"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:172
 msgid "Name of the account"
 msgstr "帐号名称"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:176
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:178
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:180
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:185
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:189
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:191
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:196
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:198
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:202
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:207
 msgid "Removes contact from roster"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:216
 msgid "Adds contact to roster"
 msgstr "向名单添加联系人"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:218
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:219
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:224
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:231
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:214
-msgid "Returns number of unreaded messages"
+#: ../src/gajim-remote.py:238
+#, fuzzy
+msgid "Returns number of unread messages"
 msgstr "未读消息的回复总数"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:242
 msgid "Opens 'Start Chat' dialog"
 msgstr "打开 '开始聊天' 对话框"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:244
 msgid "Starts chat, using this account"
 msgstr "开始聊天，使用这个账户"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:248
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:250
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:251
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:257
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:259
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:265
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "加入新房间(_J)"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "room"
+msgstr "来自"
+
+#: ../src/gajim-remote.py:267
+#, fuzzy
+msgid "Room JID"
+msgstr "房间："
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "nick"
+msgstr "昵称"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Nickname to use"
+msgstr "昵称未找到： %s "
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "password"
+msgstr "密码："
+
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "密码不符"
+
+#: ../src/gajim-remote.py:270
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:275
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "请检查 avahi-daemon 是否运行。"
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "显示/隐藏名单窗口"
+
+#: ../src/gajim-remote.py:306
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:325
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4200,29 +8239,31 @@ msgstr ""
 "\"%s\" 不在您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:328
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:335
+#: ../src/gajim-remote.py:380
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote.py:409
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"用法： %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:413
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:421
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4231,142 +8272,201 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:420
-#, python-format
+#: ../src/gajim-remote.py:493
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
+msgstr ""
+"参数“%s”未指定。\n"
+"输入“%s help %s”以获取更多信息"
+
+#: ../src/gajim-remote.py:498
+#, fuzzy, python-format
 msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:517
+#, fuzzy
+msgid "Wrong uri"
+msgstr "错误主机"
+
+#: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "主题"
 
+#: ../src/gajim_themes_window.py:97
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "无法删除当前主题"
+
+#: ../src/gajim_themes_window.py:98
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:172
 msgid "theme name"
 msgstr "主题名称"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
 msgstr "无法删除当前主题"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "私聊"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "私聊"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:150
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
-#, python-format
-msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+#: ../src/groupchat_control.py:152
+#, 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:144
-msgid "Group Chat"
-msgstr "群聊"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "群聊"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:451
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
+#: ../src/groupchat_control.py:603
+#, fuzzy
+msgid "Conversation with "
+msgstr "对话历史"
+
+#: ../src/groupchat_control.py:605
+#, fuzzy
+msgid "Continued conversation"
+msgstr "连接"
+
+#: ../src/groupchat_control.py:1027
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1028
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1127
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1129
+#, fuzzy
+msgid "A new room has been created"
+msgstr "注册新账户成功"
+
+#: ../src/groupchat_control.py:1132
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:1138
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:1142
 #, 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:842
+#: ../src/groupchat_control.py:1149
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:1153
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:1162
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
+
+#: ../src/groupchat_control.py:1201
+#, fuzzy
+msgid "affiliation changed"
+msgstr "会籍："
+
+#: ../src/groupchat_control.py:1206
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1211
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1280
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s 现在成了 %s"
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
 
-#: ../src/groupchat_control.py:936
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s 被踢出：%(reason)s"
+
+#: ../src/groupchat_control.py:1332
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s 正在 %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "无效用户名"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1510
 msgid "This group chat has no subject"
 msgstr "这个群聊没有主题"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1521
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr " %s 可能不是有效的 JID "
-
-#: ../src/groupchat_control.py:1227
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "没有此命令：/%s ( 如果想送出，请用请用前缀 /say )"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "命令： %s "
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1656
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4377,44 +8477,35 @@ msgstr ""
 "用法：/%s <昵称|JID> [原因]，从此群聊封禁 JID。昵称可能被代替，除了包含“@”。"
 "如果 JID 在群聊里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_control.py:1259
-#, python-format
+#: ../src/groupchat_control.py:1663
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_control.py:1263
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "用法：/%s，清除文本窗口。"
-
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_control.py:1268
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "用法：/%s，隐藏聊天按钮。"
-
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1675
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前群聊，可以提供一个原因。"
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1679
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4424,196 +8515,192 @@ msgstr ""
 "用法：/%s <昵称> [原因]，通过昵称移除群聊房主，原因可选。注意：不支持含空格的"
 "昵称。"
 
-#: ../src/groupchat_control.py:1284
-#, python-format
+#: ../src/groupchat_control.py:1692
+#, fuzzy, python-format
 msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
-
-#: ../src/groupchat_control.py:1288
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1697
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "用法：/%s [主题]，显示或更新群聊的拥有者。"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "用法：/%s [主题]，显示或更新当前群聊的主题。"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1708
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "没有 /%s 的帮助信息"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1837
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1358
+#: ../src/groupchat_control.py:1839
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1362 ../src/roster_window.py:3962
-msgid "Do _not ask me again"
-msgstr "不再提问此问题(_N)"
-
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1876
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1877
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1881
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1882
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/groupchat_control.py:1432
-msgid "Bookmark already set"
-msgstr "书签已设定"
-
-#: ../src/groupchat_control.py:1433
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "群聊“%s”已在您的书签中。"
+#. Ask for a reason
+#: ../src/groupchat_control.py:1908
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "描述： %s"
 
-#: ../src/groupchat_control.py:1442
-msgid "Bookmark has been added successfully"
-msgstr "书签添加成功"
+#: ../src/groupchat_control.py:1909
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
 
-#: ../src/groupchat_control.py:1443
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "您可以通过“动作”菜单管理您的名单。"
+#: ../src/groupchat_control.py:1911
+msgid "You may also enter an alternate venue:"
+msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:2083
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2387
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "发现一个程序错误"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr "它可能不是致命的，但仍应该提交给开发者。"
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "报告错误(_R)"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "细节"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:356
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:359
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:334
+#: ../src/gtkgui_helpers.py:396
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:733
+msgid "Gajim is not the default Jabber client"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:734
+#, fuzzy
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "确认覆盖该文件？"
+
+#: ../src/gtkgui_helpers.py:735
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+
+#: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:805
 #, 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:738
+#: ../src/gtkgui_helpers.py:844
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:97
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:137
 msgid "Contacts"
 msgstr "联系人"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_window.py:95
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:156 ../src/history_manager.py:208
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_window.py:103
 msgid "Message"
 msgstr "消息"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:224
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库？（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:226
 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 "
@@ -4626,365 +8713,345 @@ msgstr ""
 "\n"
 "如果您点击“是”，请等待..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:437
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:512
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说： %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:549
 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:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:553 ../src/history_manager.py:588
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:585
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息？"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:287
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:332
+msgid "Disk Error"
+msgstr ""
+
+#: ../src/history_window.py:413
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s 的状态是 %(status)s"
-
-#: ../src/history_window.py:271
+#: ../src/history_window.py:423
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态：%(status)s：%(status_msg)s"
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:426
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "无法读取图片"
+
+#: ../src/htmltextview.py:612
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:446
+msgid "Chats"
+msgstr "聊天"
+
+#: ../src/message_window.py:448
+msgid "Group Chats"
+msgstr "群聊"
+
+#: ../src/message_window.py:450
+msgid "Private Chats"
+msgstr "私聊"
+
+#: ../src/message_window.py:456
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/message_window.py:274
-#, python-format
-msgid "%s - Gajim"
-msgstr "%s - Gajim"
+#: ../src/negotiation.py:34
+msgid "- messages will be logged"
+msgstr ""
+
+#: ../src/negotiation.py:36
+msgid "- messages will not be logged"
+msgstr ""
 
-#: ../src/notify.py:196
+#: ../src/notify.py:230
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 状态改变"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:240
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:248
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:260
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:268
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "来自群聊 %s 的私人消息"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:270
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s： %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:273
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "来自 %(nickname)s 的新消息"
+
+#: ../src/notify.py:279
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/osx/growler.py:10
+#, fuzzy
+msgid "Generic"
+msgstr "常规"
+
+#: ../src/profile_window.py:56
 msgid "Retrieving profile..."
 msgstr "取回概况..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr "单击以设置您的明细"
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#, fuzzy
+msgid "File is empty"
+msgstr "文件路径"
+
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#, fuzzy
+msgid "File does not exist"
+msgstr "不存在这样的群聊"
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:126 ../src/profile_window.py:142
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:252
 msgid "Information received"
 msgstr "收到信息"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:321
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:335
 msgid "Sending profile..."
 msgstr "发送概况..."
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr "信息已发布"
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:350
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:357
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:358
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "无法脱机获取个人信息。"
-
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
-msgid "Observers"
-msgstr "旁观者"
-
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
-msgid "You cannot join a group chat while you are invisible"
-msgstr "隐身时无法加入群聊"
+#: ../src/roster_window.py:1860
+msgid "Authorization has been sent"
+msgstr "授权发送成功"
 
-#. new chat
-#. for chat_with
-#. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#: ../src/roster_window.py:1861
 #, python-format
-msgid "using account %s"
-msgstr "使用账户 %s"
+msgid "Now \"%s\" will know your status."
+msgstr "现在“%s”将知道您的状态。"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
-#. add
-#: ../src/roster_window.py:903
-#, python-format
-msgid "to %s account"
-msgstr "至帐户 %s"
+#: ../src/roster_window.py:1881
+msgid "Subscription request has been sent"
+msgstr "认证请求已发出"
 
-#. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1882
 #, python-format
-msgid "using %s account"
-msgstr "使用账户 %s"
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#. profile, avatar
-#: ../src/roster_window.py:983
+#: ../src/roster_window.py:1894
+msgid "Authorization has been removed"
+msgstr "授权被移除"
+
+#: ../src/roster_window.py:1895
 #, python-format
-msgid "of account %s"
-msgstr "帐户 %s 的"
+msgid "Now \"%s\" will always see you as offline."
+msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1003
-msgid "_Manage Bookmarks..."
-msgstr "书签管理(_M)..."
+#: ../src/roster_window.py:1920
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
 
-#: ../src/roster_window.py:1032
-#, python-format
-msgid "for account %s"
-msgstr "为帐户 %s"
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+msgid "GPG is not usable"
+msgstr ""
 
-#. History manager
-#: ../src/roster_window.py:1053
-msgid "History Manager"
-msgstr "历史管理器"
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+msgid "You are participating in one or more group chats"
+msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:1062
-msgid "_Join New Group Chat"
-msgstr "加入新群聊(_J)"
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr "隐身将从所有群聊中断开。确定隐身？"
+
+#: ../src/roster_window.py:2146
+msgid "desync'ed"
+msgstr ""
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:2285
+#, fuzzy
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr "启用历史后才能再次重读消息"
+
+#: ../src/roster_window.py:2522
 msgid "You must read them before removing this transport."
 msgstr "移除代理前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:2525
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:2526
+#, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:2529
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:1393
-#, python-format
+#: ../src/roster_window.py:2534
+#, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
-"these transports:%s"
+"these transports: %s"
 msgstr "您将无法从这些代理的联系人收发消息：%s"
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:2668
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:2669
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:2676
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:2677
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:2733
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:2734
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从名单中删除组 %s ?"
 
-#: ../src/roster_window.py:1478
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从名单移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:2774
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:2775
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-msgid "_New group chat"
-msgstr "新群聊(_N)"
-
-#: ../src/roster_window.py:1842
-msgid "I would like to add you to my roster"
-msgstr "我想加您为好友"
-
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
-msgid "Send Group M_essage"
-msgstr "发送群组消息(_E)"
-
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "重命名(_N)"
-
-#: ../src/roster_window.py:2058
-msgid "To all users"
-msgstr "向所有的用户"
-
-#: ../src/roster_window.py:2061
-msgid "To all online users"
-msgstr "向所有在线用户"
-
-#: ../src/roster_window.py:2097
-msgid "_Log on"
-msgstr "登入(_L)"
-
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "退出登录(_O)"
-
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
-msgid "_Change Status Message"
-msgstr "更改状态消息(_C)"
-
-#: ../src/roster_window.py:2372
-msgid "Authorization has been sent"
-msgstr "授权发送成功"
-
-#: ../src/roster_window.py:2373
-#, python-format
-msgid "Now \"%s\" will know your status."
-msgstr "现在“%s”将知道您的状态。"
-
-#: ../src/roster_window.py:2393
-msgid "Subscription request has been sent"
-msgstr "认证请求已发出"
-
-#: ../src/roster_window.py:2394
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
-
-#: ../src/roster_window.py:2406
-msgid "Authorization has been removed"
-msgstr "授权被移除"
-
-#: ../src/roster_window.py:2407
-#, python-format
-msgid "Now \"%s\" will always see you as offline."
-msgstr "“%s” 将一直看到您的状态为离线。"
-
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3128
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3132
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:2624
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "想做什么？"
+
+#: ../src/roster_window.py:3141
 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:2627
+#: ../src/roster_window.py:3144
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2631
+#: ../src/roster_window.py:3148
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的名单中移除"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3152
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -4993,193 +9060,355 @@ msgstr ""
 "移除这些联系人：%s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#. TODO: make this string translatable
-#. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "您将在无 OpenPGP 情况下连接到 %s。"
-
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "要求密文"
-
-#: ../src/roster_window.py:2711
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "为账户 %s 输入 GPG 密文字段"
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "保存密文"
-
-#: ../src/roster_window.py:2724
-msgid "Wrong Passphrase"
-msgstr "错误字段"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "请重新输入您的 GPG 字段或点“取消”"
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
-msgid "You are participating in one or more group chats"
-msgstr "您在一或多个群聊中"
-
-#: ../src/roster_window.py:2783 ../src/roster_window.py:2843
-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:2800
+#: ../src/roster_window.py:3191
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3192
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:2899
-#, python-format
-msgid "\"%(title)s\" by %(artist)s"
-msgstr "\"%(title)s\" %(artist)s"
-
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
-msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled."
-msgstr "启用历史后才能再次重读消息"
-
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:3708
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持元联系人存储"
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:3710
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
 
-#: ../src/roster_window.py:3956
+#: ../src/roster_window.py:3784
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3958
+#: ../src/roster_window.py:3786
+#, fuzzy
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
 "或代理账户时。"
 
-#: ../src/roster_window.py:4125
+#: ../src/roster_window.py:3899
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "无效文件"
+
+#: ../src/roster_window.py:3910
+#, 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 想发送给您一个文件："
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
 #, python-format
-msgid "Drop %s in group %s"
-msgstr "将 %s 放在群 %s 中"
+msgid "using account %s"
+msgstr "使用账户 %s"
+
+#. add
+#: ../src/roster_window.py:4674
+#, python-format
+msgid "to %s account"
+msgstr "至帐户 %s"
+
+#. disco
+#: ../src/roster_window.py:4679
+#, python-format
+msgid "using %s account"
+msgstr "使用账户 %s"
+
+#: ../src/roster_window.py:4716 ../src/systray.py:303
+msgid "_Manage Bookmarks..."
+msgstr "书签管理(_M)..."
+
+#. profile, avatar
+#: ../src/roster_window.py:4736
+#, python-format
+msgid "of account %s"
+msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:4132
+#: ../src/roster_window.py:4776
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "创建 %s 和 %s 元联系人"
+msgid "for account %s"
+msgstr "为帐户 %s"
+
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+msgid "_Change Status Message"
+msgstr "更改状态消息(_C)"
+
+#: ../src/roster_window.py:4865
+#, fuzzy
+msgid "Publish Tune"
+msgstr "发布(_P)"
+
+#: ../src/roster_window.py:4873
+msgid "Mood"
+msgstr ""
+
+#: ../src/roster_window.py:4879
+#, fuzzy
+msgid "Activity"
+msgstr "活动"
+
+#: ../src/roster_window.py:4884
+#, fuzzy
+msgid "Configure Services..."
+msgstr "发掘服务(_D)..."
+
+#: ../src/roster_window.py:5035
+msgid "_Maximize All"
+msgstr ""
+
+#. Send Group Message
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+msgid "Send Group M_essage"
+msgstr "发送群组消息(_E)"
+
+#: ../src/roster_window.py:5051
+msgid "To all users"
+msgstr "向所有的用户"
+
+#: ../src/roster_window.py:5055
+msgid "To all online users"
+msgstr "向所有在线用户"
+
+#: ../src/roster_window.py:5465
+msgid "I would like to add you to my roster"
+msgstr "我想加您为好友"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5588
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "重命名联系人"
+
+#. Send single message
+#: ../src/roster_window.py:5649
+#, fuzzy
+msgid "Send Single Message"
+msgstr "发送单条消息(_S)"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:5705
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "代理"
+
+#. Modify Transport
+#: ../src/roster_window.py:5713
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "显示代理(_P)"
+
+#: ../src/roster_window.py:5788
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:5795
+#, fuzzy
+msgid "_Disconnect"
+msgstr "联系人已断开连接"
+
+#: ../src/roster_window.py:5875
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "新群聊"
+
+#. History manager
+#: ../src/roster_window.py:5988
+msgid "History Manager"
+msgstr "历史管理器"
 
-#: ../src/roster_window.py:4319
+#: ../src/roster_window.py:5997 ../src/systray.py:341
+msgid "_Join New Group Chat"
+msgstr "加入新群聊(_J)"
+
+#: ../src/roster_window.py:6207
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/systray.py:144
+#: ../src/search_window.py:93
+msgid "Waiting for results"
+msgstr ""
+
+#: ../src/search_window.py:133 ../src/search_window.py:211
+msgid "Error in received dataform"
+msgstr ""
+
+#. No result
+#: ../src/search_window.py:167 ../src/search_window.py:203
+msgid "No result"
+msgstr ""
+
+#: ../src/session.py:124
+msgid "Disk WriteError"
+msgstr ""
+
+#: ../src/session.py:238
+#, python-format
+msgid "Subject: %s"
+msgstr "主题：%s"
+
+#: ../src/session.py:398 ../src/session.py:433
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/session.py:400
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/session.py:434
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/systray.py:188
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:322
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
 msgstr "Jabber ID："
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "资源："
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此群聊的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:432
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:436
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "状态"
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:481
 #, python-format
 msgid "Last status: %s"
 msgstr "最后状态：%s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:483
 #, python-format
 msgid " since %s"
 msgstr "自从 %s"
 
+#: ../src/tooltips.py:501
+#, fuzzy
+msgid "Connected"
+msgstr "连接"
+
+#: ../src/tooltips.py:503
+#, fuzzy
+msgid "Disconnected"
+msgstr "联系人已断开连接"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:532
 msgid "Subscription: "
 msgstr "认证："
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:542
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:587
+#, fuzzy
+msgid "Mood:"
+msgstr "房间："
+
+#: ../src/tooltips.py:602
+#, fuzzy
+msgid "Activity:"
+msgstr "活动"
+
+#: ../src/tooltips.py:638
+#, fuzzy
+msgid "Tune:"
+msgstr "类型："
+
+#: ../src/tooltips.py:664
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:670
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:677
 msgid "Type: "
 msgstr "类型"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:681
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:688
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:697
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:701
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:703
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:739
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:742
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5187,1269 +9416,444 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:277
-msgid "Affiliation:"
-msgstr "关系："
+#: ../src/vcard.py:311
+#, fuzzy
+msgid "<b>Affiliation:</b>"
+msgstr "<b>应用</b>"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:291
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:332
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
-msgid " resource with priority "
-msgstr "带有优先级的资源"
-
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "建立日志数据库"
-
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is file but it should be a directory"
-msgstr "%s 应为文件但它应为一个目录"
-
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim 即将退出"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is directory but should be file"
-msgstr "%s 应为文件但它是一个目录"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "正在建立 %s 目录"
-
-#: ../src/common/config.py:55
-msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "使用 D-Bus 和通知进程显示通知"
-
-#: ../src/common/config.py:60
-msgid "Time in minutes, after which your status changes to away."
-msgstr "转换状态为“离开”之前的时间(分钟)。"
-
-#: ../src/common/config.py:61
-msgid "Away as a result of being idle"
-msgstr "发呆导致的离开"
-
-#: ../src/common/config.py:63
-msgid "Time in minutes, after which your status changes to not available."
-msgstr "转换状态为“不可用”之前的时间(分钟)"
-
-#: ../src/common/config.py:64
-msgid "Not available as a result of being idle"
-msgstr "发呆导致的不可用"
-
-#: ../src/common/config.py:82
-msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "折叠的列(账户和组)的列表(空格分隔)。"
-
-#: ../src/common/config.py:87
-msgid "Enable link-local/zeroconf messaging"
-msgstr "允许本地连接/ ZeroConf 消息"
-
-#: ../src/common/config.py:90
-msgid "Language used by speller"
-msgstr "拼写检查的语言"
-
-#: ../src/common/config.py:91
-msgid ""
-"'always' - print time for every message.\n"
-"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
-"'never' - never print time."
-msgstr ""
-"'一直' - 为每条消息打印时间。\n"
-"'有时' - 如 iChat 风格每隔几分钟打印时间。\n"
-"'从不' - 从不打印时间。"
-
-#: ../src/common/config.py:92
-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 less precise one. "
-"This is used only if print_time is 'sometimes'."
-msgstr ""
-"使用模糊时钟打印时间。模糊度的值从 1 到 4，或者 0 禁用模糊时钟。1 是最精确的"
-"时钟，4 是最不精确的。只在打印时间为 '有时' 时生效。"
-
-#: ../src/common/config.py:95
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "如可能对 * / _ 格式化字串。"
-
-#: ../src/common/config.py:96
-msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
-
-#: ../src/common/config.py:99
-msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
-msgstr ""
-"为 HTML 使用重构文本标记，如果选择加入 ASCII 格式。(如果您想使用此功能，请安"
-"装 docutils)"
-
-#: ../src/common/config.py:108
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "当在群聊中使用昵称补全时加到昵称后的字母"
-
-#: ../src/common/config.py:109
-msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
-msgstr "当请求的昵称被群聊中的其他人使用时要加到被请求的昵称后的字母。"
-
-#: ../src/common/config.py:142
-msgid "Add * and [n] in roster title?"
-msgstr "加入 * 和 [n] 在名单标题？"
-
-#: ../src/common/config.py:143
-msgid ""
-"How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
-msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
-
-#: ../src/common/config.py:144
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "距上次谈话结束的分钟数"
-
-#: ../src/common/config.py:145
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
-
-#: ../src/common/config.py:147
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Ctrl+上箭头 存储行数。"
-
-#: ../src/common/config.py:150
-#, python-format
-msgid ""
-"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
-"which means use wiktionary."
+#: ../src/vcard.py:334
+msgid "There is no pending subscription request."
 msgstr ""
-"自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
-
-#: ../src/common/config.py:153
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
-
-#: ../src/common/config.py:154
-msgid ""
-"If True, listen to D-Bus signals from NetworkManager and change the status "
-"of accounts (provided they do not have listen_to_network_manager set to "
-"False and they sync with global status) based upon the status of the network "
-"connection."
-msgstr ""
-"如果为真，监听 NetworkManager 和状态改变(被没有监听网络管理器设置为假和它们使"
-"用全局状态同步提供)的基于网络连接的 D-Bus 信号。"
-
-#: ../src/common/config.py:155
-msgid ""
-"Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "发送聊天状态通知。可以是全部，打字，禁用中的一个。"
-
-#: ../src/common/config.py:156
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr "在聊天窗口中显示聊天状态通知。可以是全部，打字，禁用中的一个。"
-
-#: ../src/common/config.py:158
-msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
-"every x minutes."
-msgstr "当不是每条消息打印时间(打印时间为有时)时，每几分钟打印它。"
-
-#: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:160
-msgid ""
-"Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前总是询问。"
-
-#: ../src/common/config.py:161
-msgid ""
-"Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
-msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前不再询问。"
-
-#: ../src/common/config.py:164
-msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
-msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
-
-#: ../src/common/config.py:166
-msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
-
-#: ../src/common/config.py:168
-msgid "Notify of events in the system trayicon."
-msgstr "在系统托盘图标通知事件。"
-
-#: ../src/common/config.py:174
-msgid "Show tab when only one conversation?"
-msgstr "只有一个会话时显示标签？"
-
-#: ../src/common/config.py:175
-msgid "Show tabbed notebook border in chat windows?"
-msgstr "在聊天窗口中显示标签？"
-
-#: ../src/common/config.py:176
-msgid "Show close button in tab?"
-msgstr "在标签上显示关闭键？"
-
-#: ../src/common/config.py:189
-msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "用分号隔开的群聊中将高亮显示的单词列表。"
-
-#: ../src/common/config.py:190
-msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
-msgstr ""
-"如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
-"时才会生效。"
-
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
-
-#: ../src/common/config.py:192
-msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-msgstr ""
-"如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
-"是动态的。"
-
-#: ../src/common/config.py:193
-msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
-msgstr ""
-"如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下"
-"方显示状态信息。"
-
-#: ../src/common/config.py:195
-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:196
-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:197
-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 ""
-"可以是 \"无\"， \"全部\" 或 \"登入与登出\"。如果是 \"无\"，当成员改变他/她的"
-"状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印"
-"所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
-
-#: ../src/common/config.py:199
-msgid "Background color of contacts when they just signed in."
-msgstr "当联系人登入时的背景色。"
-
-#: ../src/common/config.py:200
-msgid "Background color of contacts when they just signed out."
-msgstr "当联系人登出时的背景色。"
-
-#: ../src/common/config.py:202
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
-msgstr "如果为真，还原消息将用较小的字体。"
-
-#: ../src/common/config.py:203
-msgid "Don't show avatar for the transport itself."
-msgstr "不显示代理本身的明细。"
-
-#: ../src/common/config.py:204
-msgid "Don't show roster in the system taskbar."
-msgstr "不在系统任务栏显示名单。"
-
-#: ../src/common/config.py:205
-msgid ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
-msgstr ""
-"如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
-"理器的默认响应)"
-
-#: ../src/common/config.py:207
-msgid ""
-"Jabberd1.4 does not like sha info when one join a password protected group "
-"chat. Turn this option to False to stop sending sha info in group chat "
-"presences."
-msgstr ""
-"有人加入被密码保护的群聊时，Jabberd1.4 不需要 SHA 信息。将此选项置为“否”以停"
-"止在群聊中发送 SHA 信息。"
-
-#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
-msgid ""
-"Controls the window where new messages are placed.\n"
-"'always' - All messages are sent to a single window.\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. Note, changing this option requires restarting Gajim before "
-"the changes will take effect."
-msgstr ""
-"选择新消息在窗口中的位置。\n"
-"'总是' - 所有消息都发送到一个窗口。\n"
-"'从不' - 所有消息都打开单独的窗口。\n"
-"'每一个帐号' - 每个帐号的消息都发送到一个单独的窗口。\n"
-"'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
-"注意，改变该选项后必须重启 Gajim 使设置生效。"
-
-#: ../src/common/config.py:211
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "如选否，您将不会在窗口中看到明细。"
-
-#: ../src/common/config.py:212
-msgid "If True, pressing the escape key closes a tab/window."
-msgstr "如选是，按 Escape 键关闭标签/窗口。"
-
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "在群聊窗口中隐藏按钮。"
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "在双人聊天窗口中隐藏按钮"
-
-#: ../src/common/config.py:215
-msgid "Hides the banner in a group chat window"
-msgstr "在群聊窗口中隐藏标语"
-
-#: ../src/common/config.py:216
-msgid "Hides the banner in two persons chat window"
-msgstr "在双人聊天窗口中隐藏标语"
-
-#: ../src/common/config.py:217
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "在群聊窗口中隐藏房主列表。"
-
-#: ../src/common/config.py:218
-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:219
-msgid "Indentation when using merge consecutive nickame."
-msgstr "当合并连续昵称时缩进。"
-
-#: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "将会在群聊中使用彩色昵称的颜色列表。"
-
-#: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "当没有新消息时按 Ctrl-Tab 转到下一个撰写标签。"
-
-#: ../src/common/config.py:222
-msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
-msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
-
-#: ../src/common/config.py:223
-msgid ""
-"If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
-msgstr ""
-"如果为真，您将可以在修改账户窗口中为您的账户可以设置一个否定优先级。注意！当"
-"您使用否定优先级登入时您将从服务器收不到任何消息。"
-
-#: ../src/common/config.py:234
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
-msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
-
-#. yes, no, ask
-#: ../src/common/config.py:263
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2 工作区"
-
-#: ../src/common/config.py:267
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
-msgstr ""
-"如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
-"置(_P)"
-
-#: ../src/common/config.py:326
-msgid "Is OpenPGP enabled for this contact?"
-msgstr "是否为此联系人使用 OpenPGP?"
-
-#: ../src/common/config.py:327 ../src/common/config.py:330
-msgid "Language for which we want to check misspelled words"
-msgstr "想要检查拼写的语言"
-
-#: ../src/common/config.py:336
-msgid "all or space separated status"
-msgstr "全部或空格分隔的状态"
-
-#: ../src/common/config.py:337
-msgid "'yes', 'no', or 'both'"
-msgstr "'是'，'否'或'两者'"
-
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
-msgid "'yes', 'no' or ''"
-msgstr "'是'，'否'或''"
-
-#: ../src/common/config.py:351
-msgid "Sleeping"
-msgstr "正在睡觉"
-
-#: ../src/common/config.py:352
-msgid "Back soon"
-msgstr "马上回来"
-
-#: ../src/common/config.py:352
-msgid "Back in some minutes."
-msgstr "很快回来"
-
-#: ../src/common/config.py:353
-msgid "Eating"
-msgstr "吃饭"
-
-#: ../src/common/config.py:353
-msgid "I'm eating, so leave me a message."
-msgstr "正在吃饭，请留言"
-
-#: ../src/common/config.py:354
-msgid "Movie"
-msgstr "电影"
-
-#: ../src/common/config.py:354
-msgid "I'm watching a movie."
-msgstr "正在看电影"
-
-#: ../src/common/config.py:355
-msgid "Working"
-msgstr "工作"
-
-#: ../src/common/config.py:355
-msgid "I'm working."
-msgstr "工作中"
-
-#: ../src/common/config.py:356
-msgid "Phone"
-msgstr "电话"
-
-#: ../src/common/config.py:356
-msgid "I'm on the phone."
-msgstr "我在打电话"
-
-#: ../src/common/config.py:357
-msgid "Out"
-msgstr "外出"
-
-#: ../src/common/config.py:357
-msgid "I'm out enjoying life."
-msgstr "我正在享受户外生活。"
-
-#: ../src/common/config.py:361
-msgid "I'm available."
-msgstr "我现在在线。"
-
-#: ../src/common/config.py:362
-msgid "I'm free for chat."
-msgstr "自由聊天。"
-
-#: ../src/common/config.py:364
-msgid "I'm not available."
-msgstr "我现在不可用。"
-
-#: ../src/common/config.py:365
-msgid "Do not disturb."
-msgstr "不分发。"
-
-#: ../src/common/config.py:366 ../src/common/config.py:367
-msgid "Bye!"
-msgstr "再见！"
-
-#: ../src/common/config.py:376
-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:377
-msgid "Sound to play when any MUC message arrives."
-msgstr "当 MUC 信息到达时的声音"
-
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
-msgid "green"
-msgstr "绿色"
-
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
-msgid "grocery"
-msgstr "杂货店"
-
-#: ../src/common/config.py:394
-msgid "human"
-msgstr "人类"
-
-#: ../src/common/config.py:398
-msgid "marine"
-msgstr "海洋"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
-msgid "Unable to load idle module"
-msgstr "无法加载发呆模块"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid "Wrong host"
-msgstr "错误主机"
-
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
-
-#: ../src/common/connection_handlers.py:590
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "代理 %s 所需的注册信息未按时抵达"
-
-#: ../src/common/connection_handlers.py:1523
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "昵称不允许： %s "
-
-#. password required to join
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
-msgid "Unable to join group chat"
-msgstr "无法加入群聊"
-
-#: ../src/common/connection_handlers.py:1586
-msgid "A password is required to join this group chat."
-msgstr "该群聊要求密码才能加入。"
-
-#: ../src/common/connection_handlers.py:1589
-msgid "You are banned from this group chat."
-msgstr "您被该群聊封禁。"
-
-#: ../src/common/connection_handlers.py:1592
-msgid "Such group chat does not exist."
-msgstr "不存在这样的群聊"
-
-#: ../src/common/connection_handlers.py:1595
-msgid "Group chat creation is restricted."
-msgstr "群聊创建受限。"
-
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "您注册的昵称已被使用"
-
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "您不在成员名单中。"
-
-#: ../src/common/connection_handlers.py:1609
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"您申请的昵称正在使用或被其他人占有。\n"
-"从下列昵称中另外指定一个："
-
-#: ../src/common/connection_handlers.py:1659
-msgid "I would like to add you to my roster."
-msgstr "我申请添加您到联系人名单"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1680
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr " %s 请求认证"
-
-#: ../src/common/connection_handlers.py:1682
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr " %s 请求解除认证"
-
-#: ../src/common/connection_handlers.py:1684
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s 解除了认证"
-
-#: ../src/common/connection_handlers.py:1854
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
-"单管理工具移除。"
-
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "帐户“%s”的连接丢失"
-
-#: ../src/common/connection.py:176
-msgid "Reconnect manually."
-msgstr "手动重连。"
-
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "服务代理 %s 对注册请求响应错误：%s"
-
-#. wrong answer
-#: ../src/common/connection.py:213
-msgid "Invalid answer"
-msgstr "无效答案"
-
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "尚未连接到“%s”"
-
-#: ../src/common/connection.py:419
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "连接到服务器 %s:%s 通过 %s"
-
-#: ../src/common/connection.py:441
-msgid "Check your connection or try again later"
-msgstr "检查连接并稍后重试"
-
-#: ../src/common/connection.py:467
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "“%s”登录验证失败"
-
-#: ../src/common/connection.py:468
-msgid "Please check your login and password for correctness."
-msgstr "请检查登录信息和密码的正确性"
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "未获得 OpenPGP 密文"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "隐身"
-
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "离线"
-
-#: ../src/common/connection.py:629
-#, python-format
-msgid "I'm %s"
-msgstr "我是 %s"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:720
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
-
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"主题：%s\n"
-"%s"
-
-#: ../src/common/connection.py:915
-msgid "Not fetched because of invisible status"
-msgstr "由于隐身状态不获取"
-
-#. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "本机缺少 D-Bus python 绑定"
-
-#: ../src/common/dbus_support.py:34
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajim 的 D-Bus 兼容性无法使用"
-
-#: ../src/common/exceptions.py:22
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
-
-#: ../src/common/exceptions.py:30
-msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "服务不可用：Gajim不在运行，或远程控制错误"
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+msgid " resource with priority "
+msgstr "带有优先级的资源"
 
-#: ../src/common/exceptions.py:38
-msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "OpenPGP 加密"
 
-#: ../src/common/exceptions.py:46
-msgid ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"会话进程不可用。\n"
-"您可以参考 http://trac.gajim.org/wiki/GajimDBus"
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "one"
-msgstr "一"
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr "没有此命令：/%s ( 如果想送出，请用请用前缀 /say )"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "two"
-msgstr "二"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "three"
-msgstr "三"
+#~ msgid "Encryption enabled"
+#~ msgstr "启用加密"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "four"
-msgstr "四"
+#~ msgid "Encryption disabled"
+#~ msgstr "禁用加密"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "five"
-msgstr "五"
+#~ msgid "_Retype Password:"
+#~ msgstr "重新键入密码：(_R)"
 
-#: ../src/common/fuzzyclock.py:42
-msgid "six"
-msgstr "六"
+#~ msgid "_Use proxy"
+#~ msgstr "使用代理服务器(_U)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "seven"
-msgstr "七"
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "如果选择，所有使用群体兼容聊天客户端(如iChat，Trillian 或 Gaim)的本地联系"
+#~ "人将在名单中显示。您将可使它工作而不用连接到 Jabber 服务器。\n"
+#~ "只在 python-avahi 安装且 avahi 守护进程运行时有效。"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eight"
-msgstr "八"
+#~ msgid ""
+#~ "If you have 2 or more accounts and it is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们"
+#~ "就像属于同一个帐户"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "nine"
-msgstr "九"
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "允许本地消息(_E)"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "ten"
-msgstr "十"
+#~ msgid "Click to see past conversations with this contact"
+#~ msgstr "点击查看与该联系人的历史对话"
 
-#: ../src/common/fuzzyclock.py:43
-msgid "eleven"
-msgstr "十一"
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "紧凑模式(_C)  Alt+C"
 
-#: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "十二"
+#~ msgid "Click to see past conversation in this room"
+#~ msgstr "点击查看本房间的历史对话"
 
-#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
-msgstr "%0 点钟"
+#~ msgid "Build custom query"
+#~ msgstr "建立自定义查询"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
-msgstr "五过 %0"
+#~ msgid "Query Builder..."
+#~ msgstr "查询生成器..."
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
-msgstr "十过 %0"
+#~ msgid "Accept"
+#~ msgstr "接受"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
-msgstr "四分之一过 %0"
+#~ msgid "Invitation Received"
+#~ msgstr "收到邀请"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
-msgstr "二十过 %0"
+#~ msgid "<b>Format of a line</b>"
+#~ msgstr "<b>行格式</b>"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
-msgstr "二十五过 %0"
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>界面订制</b>"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
-msgstr "半过 %0"
+#~ msgid "A_fter nickname:"
+#~ msgstr "在昵称后：(_F)"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
-msgstr "二十五到 %1"
+#~ msgid "Also known as iChat style"
+#~ msgstr "也就是 i 聊天风格"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
-msgstr "二十到 %1"
+#~ 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 "
+#~ "will use the default one set here"
+#~ msgstr ""
+#~ "例如：当您允许离开的状态消息，当您改变状态至离开时 Gajim 将不再询问您状态"
+#~ "消息；将会使用默认设置的消息"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
-msgstr "四分之一到 %1"
+#~ msgid "B_efore nickname:"
+#~ msgstr "在昵称前：(_E)"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "ten to %1"
-msgstr "十到 %1"
+#~ msgid "Chat"
+#~ msgstr "聊天"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
-msgstr "五到 %1"
+#~ msgid "E_very 5 minutes"
+#~ msgstr "每 5 分钟(_V)"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
-msgstr "%1 点"
+#~ msgid "Events"
+#~ msgstr "事件"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Night"
-msgstr "夜晚"
+#~ msgid ""
+#~ "Gajim will automatically show new events by poping up the relative window"
+#~ msgstr "Gajim 会自动弹出相关窗口以显示新的事件"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Early morning"
-msgstr "清晨"
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr "Gajim 会通过屏幕右下方的弹出气泡提示新消息"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Morning"
-msgstr "早晨"
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚登录的联系人"
 
-#: ../src/common/fuzzyclock.py:62
-msgid "Almost noon"
-msgstr "晌午"
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim 仅会改变触发了新事件的联系人图标"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Noon"
-msgstr "中午"
+#~ 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 ""
+#~ "如果选定，Gajim 会在下次运行时使用本次设定的名单及聊天窗口的位置和大小"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Afternoon"
-msgstr "下午"
+#~ msgid ""
+#~ "Never\n"
+#~ "Always\n"
+#~ "Per account\n"
+#~ "Per type"
+#~ msgstr ""
+#~ "从不\n"
+#~ "总是\n"
+#~ "每一个帐号\n"
+#~ "每种类型"
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Evening"
-msgstr "晚上"
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "离开聊天状态指示(_F)："
 
-#: ../src/common/fuzzyclock.py:63
-msgid "Late evening"
-msgstr "傍晚"
+#~ msgid "Print time:"
+#~ msgstr "显示时间："
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Start of week"
-msgstr "一周开始"
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "保存名单和聊天窗口的位置及大小(_P)"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "Middle of week"
-msgstr "一周中"
+#~ msgid "Set status message to reflect currently playing _music track"
+#~ msgstr "设置状态消息为当前播放的音轨(_M)"
 
-#: ../src/common/fuzzyclock.py:65
-msgid "End of week"
-msgstr "一周末"
+#~ msgid "Show only in _roster"
+#~ msgstr "只显示名单中(_R)"
 
-#: ../src/common/fuzzyclock.py:66
-msgid "Weekend!"
-msgstr "周末"
+#~ msgid "The auto away status message"
+#~ msgstr "自动离开状态消息"
 
-#: ../src/common/helpers.py:105
-msgid "Invalid character in username."
-msgstr "无效的用户名特征。"
+#~ msgid "The auto not available status message"
+#~ msgstr "自动不可用状态消息"
 
-#: ../src/common/helpers.py:110
-msgid "Server address required."
-msgstr "此处需要服务器地址"
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
 
-#: ../src/common/helpers.py:115
-msgid "Invalid character in hostname."
-msgstr "无效的主机名特征。"
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "下列方式可用来提示您收到新的事件（消息，文件传输请求等）。请注意，只有未和"
+#~ "您进行聊天的用户发送的新消息才会触发新消息事件"
 
-#: ../src/common/helpers.py:121
-msgid "Invalid character in resource."
-msgstr "无效的资源特征。"
+#~ msgid ""
+#~ "Works for Rhythmbox and Muine players. For more players, please visit "
+#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+#~ msgstr ""
+#~ "为 Rhythmbox 和 Muine 播放器工作。 更多的播放器，请访问 http://trac.gajim."
+#~ "org/wiki/GajimAndMusicPlayer。"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:161
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
+#~ msgid "_Advanced Notifications Control..."
+#~ msgstr "高级通知设置..."
 
-#. GB means gigabyte
-#: ../src/common/helpers.py:164
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "_After time:"
+#~ msgstr "在该时间后：(_A)"
 
-#. MiB means mibibyte
-#: ../src/common/helpers.py:168
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
+#~ msgid "_Before time:"
+#~ msgstr "在该时间前：(_B)"
 
-#. MB means megabyte
-#: ../src/common/helpers.py:171
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "_Font:"
+#~ msgstr "字号：(_F)"
 
-#. KiB means kibibyte
-#: ../src/common/helpers.py:175
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
+#~ msgid "_Never"
+#~ msgstr "从不(_N)"
 
-#. KB means kilo bytes
-#: ../src/common/helpers.py:178
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "_Notify me about it"
+#~ msgstr "提醒我(_N)"
 
-#. B means bytes
-#: ../src/common/helpers.py:181
-#, python-format
-msgid "%s B"
-msgstr "%s B"
+#~ msgid "_Player:"
+#~ msgstr "参与者(_P)"
 
-#: ../src/common/helpers.py:210
-msgid "_Busy"
-msgstr "忙碌(_B)"
+#~ msgid "_Pop it up"
+#~ msgstr "弹出(_P)"
 
-#: ../src/common/helpers.py:212
-msgid "Busy"
-msgstr "忙碌"
+#~ msgid "_URL:"
+#~ msgstr "URL：(_U)"
 
-#: ../src/common/helpers.py:215
-msgid "_Not Available"
-msgstr "不可用(_N)"
+#~ msgid "Address"
+#~ msgstr "地址"
 
-#: ../src/common/helpers.py:220
-msgid "_Free for Chat"
-msgstr "自由聊天(_F)"
+#~ msgid "City:"
+#~ msgstr "城市："
 
-#: ../src/common/helpers.py:222
-msgid "Free for Chat"
-msgstr "自由聊天"
+#~ msgid "Company:"
+#~ msgstr "公司："
 
-#: ../src/common/helpers.py:225
-msgid "_Available"
-msgstr "在线(_A)"
+#~ msgid "Country:"
+#~ msgstr "国家："
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "在线"
+#~ msgid "Given:"
+#~ msgstr "教名："
 
-#: ../src/common/helpers.py:229
-msgid "Connecting"
-msgstr "正在连接"
+#~ msgid "Middle:"
+#~ msgstr "中间："
 
-#: ../src/common/helpers.py:232
-msgid "A_way"
-msgstr "离开(_A)"
+#~ msgid "Position:"
+#~ msgstr "位置："
 
-#: ../src/common/helpers.py:237
-msgid "_Offline"
-msgstr "离线(_O)"
+#~ msgid "Prefix:"
+#~ msgstr "前缀："
 
-#: ../src/common/helpers.py:239
-msgid "Offline"
-msgstr "离线"
+#~ msgid "Role:"
+#~ msgstr "角色："
 
-#: ../src/common/helpers.py:242
-msgid "_Invisible"
-msgstr "隐身(_I)"
+#~ msgid "State:"
+#~ msgstr "州："
 
-#: ../src/common/helpers.py:248
-msgid "?contact has status:Unknown"
-msgstr "?contact has status: 未知"
+#~ msgid "Suffix:"
+#~ msgstr "后缀："
 
-#: ../src/common/helpers.py:250
-msgid "?contact has status:Has errors"
-msgstr "?contact has status: 有错误"
+#~ msgid "_Retrieve"
+#~ msgstr "找回(_R)"
 
-#: ../src/common/helpers.py:255
-msgid "?Subscription we already have:None"
-msgstr "?Subscription we already have: 无"
+#~ msgid "_Remove from Roster"
+#~ msgstr "从名单中移除(_R)"
 
-#: ../src/common/helpers.py:257
-msgid "To"
-msgstr "到"
+#~ msgid "A_ccounts"
+#~ msgstr "账户(_A)"
 
-#: ../src/common/helpers.py:261
-msgid "Both"
-msgstr "双方"
+#~ msgid "_Filter:"
+#~ msgstr "过滤器(_F):"
 
-#: ../src/common/helpers.py:269
-msgid "?Ask (for Subscription):None"
-msgstr "?Ask (for Subscription): 无"
+#~ msgid "Ask:"
+#~ msgstr "请求："
 
-#: ../src/common/helpers.py:271
-msgid "Subscribe"
-msgstr "认证"
+#~ msgid "Client:"
+#~ msgstr "客户端："
 
-#: ../src/common/helpers.py:280
-msgid "?Group Chat Contact Role:None"
-msgstr "?Group Chat Contact Role: 无"
-
-#: ../src/common/helpers.py:283
-msgid "Moderators"
-msgstr "主持人"
+#~ msgid "OS:"
+#~ msgstr "操作系统："
 
-#: ../src/common/helpers.py:285
-msgid "Moderator"
-msgstr "主持人"
-
-#: ../src/common/helpers.py:288
-msgid "Participants"
-msgstr "参与者"
-
-#: ../src/common/helpers.py:290
-msgid "Participant"
-msgstr "参与者"
-
-#: ../src/common/helpers.py:293
-msgid "Visitors"
-msgstr "访客"
-
-#: ../src/common/helpers.py:295
-msgid "Visitor"
-msgstr "访客"
+#~ msgid "Subscription:"
+#~ msgstr "认证："
 
-#: ../src/common/helpers.py:301
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "?Group Chat Contact Affiliation: 无"
+#~ 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 "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "如果拼写检查不匹配您所使用用的语言，请正确设定您的 $LANG 。例如，中文用户"
+#~ "就在 ~/.bash_profile 中键入 LANG=zh_CN 或 LANG=zh_CN.UTF-8 ，或在 /etc/"
+#~ "profile 中进行全局设定。\n"
+#~ "\n"
+#~ "拼写检查功能未启用"
 
-#: ../src/common/helpers.py:303
-msgid "Owner"
-msgstr "所有者"
+#~ msgid "Every %s _minutes"
+#~ msgstr "每 %s 分钟(m)"
 
-#: ../src/common/helpers.py:305
-msgid "Administrator"
-msgstr "管理员"
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "必须为新账户输入密码。"
 
-#: ../src/common/helpers.py:307
-msgid "Member"
-msgstr "成员"
+#~ msgid "You will always see him or her as offline."
+#~ msgstr "您将一直看到他/她的状态为离线。"
 
-#: ../src/common/helpers.py:346
-msgid "is paying attention to the conversation"
-msgstr "正在专注于聊天"
+#~ msgid "%s is now %s (%s)"
+#~ msgstr "%s 正在 %s (%s)."
 
-#: ../src/common/helpers.py:348
-msgid "is doing something else"
-msgstr "在做其他事"
+#~ msgid ""
+#~ "\n"
+#~ "From: %(from_address)s"
+#~ msgstr ""
+#~ "\n"
+#~ "从：%(from_address)s"
 
-#: ../src/common/helpers.py:350
-msgid "is composing a message..."
-msgstr "正在输入消息..."
+#~ msgid "Network Manager support not available"
+#~ msgstr "网络管理支持不可用"
 
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
-msgid "paused composing a message"
-msgstr "中断输入消息"
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
-#: ../src/common/helpers.py:355
-msgid "has closed the chat window or tab"
-msgstr "关闭了聊天窗口或标签"
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "用法： %s %s %s \n"
+#~ "\t %s"
 
-#: ../src/common/helpers.py:881
-#, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] " %d 条未读消息 "
+#~ msgid "Private Chat"
+#~ msgstr "私聊"
 
-#: ../src/common/helpers.py:887
-#, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] " %d 条未读单独消息"
+#~ msgid "Group Chat"
+#~ msgstr "群聊"
 
-#: ../src/common/helpers.py:893
-#, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] " %d 条未读群聊消息"
+#~ msgid "%s is now %s"
+#~ msgstr "%s 正在 %s"
 
-#: ../src/common/helpers.py:899
-#, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] " %d 未读私人消息"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr " %s 可能不是有效的 JID "
 
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
+#~ msgid "%s - Gajim"
+#~ msgstr "%s - Gajim"
 
-#. we talk about a file
-#: ../src/common/optparser.py:60
-#, python-format
-msgid "error: cannot open %s for reading"
-msgstr "错误：无法按读打开文件 %s"
+#~ msgid "Information published"
+#~ msgstr "信息已发布"
 
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr "gtk+"
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr "无法脱机获取个人信息。"
 
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
-msgid "cyan"
-msgstr "青色"
+#~ msgid "_New group chat"
+#~ msgstr "新群聊(_N)"
 
-#: ../src/common/optparser.py:302
-msgid "migrating logs database to indeces"
-msgstr "合并日志数据库"
+#~ msgid "_Log on"
+#~ msgstr "登入(_L)"
 
-#: ../src/common/passwords.py:86
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim 帐户 %s"
+#~ msgid "Log _off"
+#~ msgstr "退出登录(_O)"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid ""
-"Connection to host could not be established: Incorrect answer from server."
-msgstr "到主机的连接无法建立：服务器应答不正确。"
+#~ msgid "Save passphrase"
+#~ msgstr "保存密文"
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "到主机的连接无法建立"
+#~ msgid "Drop %s in group %s"
+#~ msgstr "将 %s 放在群 %s 中"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "到主机的连接无法建立：发送数据超时。"
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "创建 %s 和 %s 元联系人"
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
-msgid "Contact is offline. Your message could not be sent."
-msgstr "联系人离线。您的消息将不被发送。"
+#~ msgid "Affiliation:"
+#~ msgstr "关系："
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "您需要重新连接才能继续收发消息。"
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "在双人聊天窗口中隐藏按钮"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-msgid "Avahi error"
-msgstr "Avahi 错误"
+#~ msgid "Connected to server %s:%s with %s"
+#~ msgstr "连接到服务器 %s:%s 通过 %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#, python-format
-msgid ""
-"%s\n"
-"Link-local messaging might not work properly."
-msgstr ""
-"%s\n"
-"本地消息将无法正常工作。"
+#~ msgid "invisible"
+#~ msgstr "隐身"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
-msgid "Please check if Avahi is installed."
-msgstr "请检查 Avahi 是否已经安装。"
+#~ msgid "offline"
+#~ msgstr "离线"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
-msgid "Could not start local service"
-msgstr "无法启动本地服务"
+#~ msgid "I'm %s"
+#~ msgstr "我是 %s"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
-#, python-format
-msgid "Unable to bind to port %d."
-msgstr "无法绑定端口 %d。"
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] " %d 条未读单独消息"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
-msgid "Please check if avahi-daemon is running."
-msgstr "请检查 avahi-daemon 是否运行。"
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] " %d 条未读群聊消息"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
-#, python-format
-msgid "Could not change status of account \"%s\""
-msgstr "无法改变账户“%s”的状态"
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] " %d 未读私人消息"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr "没有连接或隐身。您的消息将不会被发送。"
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
-msgid "[This message is encrypted]"
-msgstr "[本条消息已加密]"
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
+#~ msgstr "到主机的连接无法建立：服务器应答不正确。"
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "添加服务错误。 %s"
+#~ msgid "Connection to host could not be established"
+#~ msgstr "到主机的连接无法建立"
 
 #~ msgid "_New room"
 #~ msgstr "新房间"
@@ -6457,9 +9861,6 @@ msgstr "添加服务错误。 %s"
 #~ msgid "Role: "
 #~ msgstr "角色："
 
-#~ msgid "Affiliation: "
-#~ msgstr "会籍："
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -6491,9 +9892,6 @@ msgstr "添加服务错误。 %s"
 #~ msgid "Invalid room or server name"
 #~ msgstr "无效房间或服务器名"
 
-#~ msgid "Unknown D-Bus version: %s"
-#~ msgstr "未知的 D-Bus 版本： %s"
-
 #~ msgid "vCard publication succeeded"
 #~ msgstr " vCard 发布成功"
 
@@ -6503,9 +9901,6 @@ msgstr "添加服务错误。 %s"
 #~ msgid "Migrating Logs..."
 #~ msgstr "正在移动日志..."
 
-#~ msgid "_Join New Room"
-#~ msgstr "加入新房间(_J)"
-
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d 条未读消息 "
@@ -6519,27 +9914,15 @@ msgstr "添加服务错误。 %s"
 #~ msgid "Send File"
 #~ msgstr "发送文件"
 
-#~ msgid "Underline"
-#~ msgstr "下划线"
-
-#~ msgid "Would you like to overwrite it?"
-#~ msgstr "确认覆盖该文件？"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "加入新房间(_J)..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
-
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>请选择一个选项</b>："
 
 #~ msgid "Delete Message of the Day"
 #~ msgstr "删除每日消息"
 
-#~ msgid "I want a notification popup:"
-#~ msgstr "聊天状态指示(_F)："
-
 #~ msgid "I want to listen to:"
 #~ msgstr "%s 想发送给您一个文件："
 
@@ -6555,18 +9938,12 @@ msgstr "添加服务错误。 %s"
 #~ msgid "_XML Console..."
 #~ msgstr "XML 控制(_X)..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "选择明细"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "开启新聊天窗口时使用紧凑模式"
 
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "开启新群聊窗口时使用紧凑模式"
 
-#~ msgid "plain"
-#~ msgstr "高原"
-
 #~ msgid "Send"
 #~ msgstr "发送"
 
@@ -6582,9 +9959,6 @@ msgstr "添加服务错误。 %s"
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "日志被成功移动到数据库。"
 
-#~ msgid "If checked, Gajim will also have a trayicon"
-#~ msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
-
 #~ msgid "Start Chat with Contact"
 #~ msgstr "使用账户 %s 加入群聊"
 
@@ -6600,15 +9974,9 @@ msgstr "添加服务错误。 %s"
 #~ msgid "Sound"
 #~ msgstr "声音"
 
-#~ msgid "Text"
-#~ msgstr "文本"
-
 #~ msgid "Image"
 #~ msgstr "形象"
 
-#~ msgid "From %s"
-#~ msgstr "来自 %s"
-
 #~ msgid "To %s"
 #~ msgstr "到 %s"